Page Comparison

...

1. Create a new branch at the HEAD of their feature branch: git checkout -b <feature>-resolved <feature>`
2. Make sure renaming is caught in the merge: git config merge.renamelimit 99999
3. Merge the <merge> branch into their new branch: git merge origin/<merge>
   1. NOTE: You can replace origin/<merge> with a specific hash to make sure the merge is what you were attempting.
4. Resolve the merge conflicts
   1. Edit the conflicting files (listed with git status)
   2. Add the resolved files: git add <files>
   3. Commit the resulting merge: git commit
5. Push the resolution branch: git push origing <feature>origin <feature>-resolved

Using provided resolutions to build a rerere cache

...