jmeaster30 / git-merge-polite Goto Github PK
View Code? Open in Web Editor NEWThis is a merge driver I needed which is essentially the union merge strategy but always puts your changes after the ones from the branch you are merging from.
License: The Unlicense