[llvm-dev] [RFC] One or many git repositories?
Renato Golin via llvm-dev
llvm-dev at lists.llvm.org
Mon Jul 25 07:10:39 PDT 2016
On 25 July 2016 at 14:55, Daniel Sanders <Daniel.Sanders at imgtec.com> wrote:
> I know of a way but it's not very nice. The gist of it is to checkout the
> downstream branch just before the bad merge and then merge the first
> 100 commits from upstream. If the result is good then merge the next
> 100, but if it's bad then 'git reset --hard' and merge 10 instead. You'll
> eventually find the commit that made it bad. Essentially, the idea is to
> make a throwaway branch that merges more frequently. I do something
> similar to rebase my work to master since gradually rebasing often
> causes all the conflicts to go away.
This is essentially what git-imerge does, you only need to define
"good merge" in the form of a script or CI job.
More information about the llvm-dev