merge all theirs but merge one ours
An example would be a file that is a few versions ahead of the merge that I am about to do and I just want one hack to be included in the local branch file .
- Why does git merge a branch into itself?
- Git push fails to github: failed to read object
- Diff & Merging between different VCS
- Git: How to manually manipulate/craft a merge between two branches when no conflict occurs
- Git commit squashed when merging upstream, how do I update my local repo
- Merge code between two dfferent git repositories