Displaying 1 result from an estimated 1 matches for "1050746".
2015 Nov 05
8
"Living Downstream Without Drowning" BOF @ Dev Meeting
On 19 Oct 2015, at 19:05, Bruce Hoult via llvm-dev <llvm-dev at lists.llvm.org> wrote:
>
> I find the git imerge script extremely useful for this kind of situation.
>
> https://github.com/mhagger/git-imerge
>
> Logically, it does something similar to rebasing your local branch onto EVERY commit in the upstream branch, in turn, until it finds conflicts. There is