Unstaging a list of files in git
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 …