Re: merge conflicts?

[<don...@is...>]

Bruno Haible writes:
...
 > >  abort: outstanding merge conflicts
 > 
 > Did you try a Google search for
 >   "outstanding merge conflicts" site:stackoverflow.com

I hadn't before, and now that I have I don't see how it helps.