Skip to content

README.md

Latest commit

 

History

History
16 lines (15 loc) · 772 Bytes

README.md

File metadata and controls

16 lines (15 loc) · 772 Bytes

GitExercise_Conflicts

  1. Clone this repo to your datahub or local computer (your choice)
  2. Merging ex1 branch into main branch... the difference here is a simple line of text conflict\
    1. first look at the diff
    2. now merge e1 into main; note how the conflict gets shown to you...
    3. resolve the conflict in whichever way you choose,
    4. add and commit the changes on main
  3. Merging ex2 branch into main branch... the difference here is metadata and binaries from a plot
    1. first look at the diff
    2. now checkout e2.
    3. remove the metadata and outputs by clearing all cell output
    4. add and commit the changes on e2
    5. now merge e2 into main
    6. resolve the conflict in whichever way you choose,
    7. add and commit the changes on main