David Brown, Thu, Jul 03, 2008 20:26:50 +0200: > Yesterday, one developer cherry picked company B's changes into a branch. > It appears he resolved the conflicts for each commit, which should make > bisecting easier. > > The problem is that we now have very divergent history. ...and have absolutely no idea on what were the changes of the company B were made. > Any advice on how to make use of how he resolved conflicts in order to > merge company B's changes in using git-merge. ... Let that developer do the merge next time? Or let the B do a merge with a commonly accepted base? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
