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

Remove the 2nd part of conflicts #36

Open sstevens2 opened 2 years ago

sstevens2 commented 2 years ago

I think we can replace the part where you see that conflicts "remembers" the resolution. I don't usually teach it. Instead maybe we put a callout that mentions the important parts.

sstevens2 commented 1 year ago

Would like to get other instructors feedback on this. Do you teach the 2nd part of conflicts?