search

carpentries-incubator / git-novice-branch-pr

Version Control with Git
https://carpentries-incubator.github.io/git-novice-branch-pr
Other
5 stars 17 forks source link

Conflict mods #13

Closed pshriwise closed 7 years ago

pshriwise commented 7 years ago

Altering the conflicts lesson to keep both lines. This was the only way I was able to get a successful continuation of the branch without further merge conflicts.

sstevens2 commented 7 years ago

Maybe we want to leave a note for the possible online learner and instructor that this may not always work depending on how they solve the conflict

pshriwise commented 7 years ago

I think that's the best solution. I'll make that a call-out in the lesson.

I was going to say I'd close this PR and do it in a separate PR, but I think that really they should keep both lines so I'll just add that call-out to this PR.

sstevens2 commented 7 years ago

Looks good to me! I can go ahead and merge this if you are happy with it @pshriwise

pshriwise commented 7 years ago

As happy w/ it as I'll ever be :smiley: