search for: build&test

...hub.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 cleverness to make this efficient, let you stop and restart the merge, share intermediate state with others, build&test intermediate results (automatically if you want). At the end of the process you can choose to keep the intermediate commits that are the same as the result of a "git merge" or a "git rebase" or a new feature the author calls "rebase with history" that keeps th...

Mike Edwards and I will be hosting a talk/BOF called "Living Downstream Without Drowning" which is for anyone maintaining a bunch of local changes to Clang/LLVM/etc. We will present some procedures and tactics we've evolved at Sony, including patch tactics for reducing merge pain, and how we are throwing automation at the problem. But we are really curious what YOU have done