search for: innappropriate

...k rebase is really the issue here. Linux kernel developers rebase all the time. It's required before merging to mainline. Of course at the point of the merge your feature branch should go away so the rebase is moot. I _think_ the "rebase" problem you describe is more to do with an innappropriate use of git - keeping branches around through multiple merges. I totally understand the attraction of doing that but with a rebase policy (common in the git world) it's going to cause issues of the type your described. Still, the merge often works just fine even in the presence of the rebase -...

LLVM Community, > http://lists.cs.uiuc.edu/pipermail/llvmdev/2011-July/041738.html This was extraordinarily valuable in learning to understand the situation - thank you David Blaikie for pointing me to it. A few key snippets: "Because I optimize for the code reviewer, not the patch submitter," Chris Lattner "Forcing transitioning to git makes no sense for a lot of us - for