When merging I find it helpful sometimes to un-stage all changes with conflicts. This allows you to commit changes without conflicts, and then resolve the conflicts as a separate step.<\/p>\n
If you do a cherry pick:<\/p>\n
\ngit cherry-pick ...insert sha here...\n<\/pre>\nYou will see changes that have conflicts, but the parts of the files that don’t conflict are automatically staged. To undo this, you can get a list of the files with conflicts like so (note this doesn’t cover files deleted in one repository, but that is typically easier to resolve manually):<\/p>\n
\ngit diff --name-only --diff-filter=U \n<\/pre>\nYou can then make a shell script that lets you unstage all of these:<\/p>\n
\ngit diff --name-only --diff-filter=U | sed \"s\/(.*)\/git reset $1\/\" | unstage.sh\n.\/unstage.sh\n<\/pre>\n","protected":false},"excerpt":{"rendered":"When merging I find it helpful sometimes to un-stage all changes with conflicts. This allows you to commit changes without conflicts, and then resolve the conflicts as a separate step. If you do a cherry pick: git cherry-pick …insert sha here… You will see changes that have conflicts, but the parts of the files that … <\/p>\n