Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Fetching latest commit…
Cannot retrieve the latest commit at this time.
|Failed to load latest commit information.|
git-merge-rename -- Resolve merges by forking the file ====================================================== git-merge-rename is a custom merge strategy, inspired by Dropbox's conflict-handling, which resolves merges by creating two copies of the conflicted file, leaving the original copy in place, and copying the other side's version into a renamed path. Barring error conditions (e.g. out of disk), merges using this merge strategy should never fail, which should potentially make it attractive for introducing new users to git, since they can safely "git pull" without fear of entering the dreaded (by novices) conflicted-merge state.