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

Fixing conflict lesson command narrative #58

Closed JimCircadian closed 5 months ago

JimCircadian commented 7 months ago

There are a couple of inconsistencies when applying git merge marsTemp, the output doesn't relate to the git merge command but rather the git status output