Handle Git Patch Apply Conflicts

Sometimes I update a repository of a customer with the newest version of our software and I made some really small changes in the code only for this customer. I usually stash those changes, checkout the newest version and then apply the changes again.

Sometimes conflicts apply from that stash apply. Here is a solution on how to fix it without committing anything:

  1. Save the stashed changes
  2. Unstage the merge conflicts: git reset HEAD .
  3. Apply them manually

Any better ideas??

Leave a Reply

Your email address will not be published. Required fields are marked *

You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <s> <strike> <strong>