`git merge` - Githubissues

ns-rse / git-collaboration

Intermediate level course on using Git for collaboration

https://ns-rse.github.io/git-collaboration/

Other

1 stars 0 forks source link

Closed ns-rse closed 4 months ago

ns-rse commented 5 months ago

Useful commands (via Julia Evans)

git show --first-parent
git show --remerge-diff (see Review merge conflict resolution with remerge diff