On Wed, Sep 10, 2014 at 10:56:42AM +0000, Andreas Tscharner wrote:
>
> [snip]
> > Just wondering if anyone may have an idea how my repository
> > got so buggered up. I tried to merge a branch to the trunk
> > and received 49 conflicts. 2 are files that do not need to
> > be tracked so that leaves 47. Out of the 47 there are two
> > problems, local add, incoming add upon merge & local delete,
> > incoming delete upon merge. I was doing some code cleanup so
> > it is possible I deleted the files in two different branches.
> > But I know for certain that I did not create the same file
> > twice. I did a diff on the first one and it is identical in
> > both branches, easy to fix, difficult to determine how the
> > conflict came about. The second file is different, I deleted
> > dome code that is not needed anymore. More work to fix.
> > With the conflict it causes the merge to fail thus making
> > this much more time consuming to fix. The question I have is
>
> I don't want to offend anyone here, but such bogus merge conflicts were the reason we changed to git.
Apples and oranges.
>
> > anyone know what I could’ve done to create these false conflicts?
> >
> Not to my knowledge...
Did you ask for help on this list when you got similar conflicts?
Any pointers to threads I could read?
I'm genuinly interested in what conflicts you were seeing
and how you attempted to resolve them.
But I need details, handwavy statements won't help me.
Received on 2014-09-10 13:33:45 CEST