subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Markus Schaber <m.scha...@codesys.com>
Subject AW: Merge problem
Date Thu, 11 Sep 2014 12:03:36 GMT
Hi, John,

I guess Stefans question for more details was directed to Andreas and his rather unspecific
rant, not to your email.

Best regards

Markus Schaber

CODESYS® a trademark of 3S-Smart Software Solutions GmbH

Inspiring Automation Solutions

3S-Smart Software Solutions GmbH
Dipl.-Inf. Markus Schaber | Product Development Core Technology
Memminger Str. 151 | 87439 Kempten | Germany
Tel. +49-831-54031-979 | Fax +49-831-54031-50

E-Mail: m.schaber@codesys.com | Web: http://www.codesys.com | CODESYS store: http://store.codesys.com
CODESYS forum: http://forum.codesys.com

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten
HRB 6186 | Tax ID No.: DE 167014915

This e-mail may contain confidential and/or privileged information. If you are not the intended
recipient (or have received
this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorised
copying, disclosure
or distribution of the material in this e-mail is strictly forbidden.

> -----Ursprüngliche Nachricht-----
> Von: John Maher [mailto:JohnM@rotair.com]
> Gesendet: Donnerstag, 11. September 2014 13:51
> An: Stefan Sperling; Andreas Tscharner
> Cc: Subversion help
> Betreff: RE: Merge problem
> 
> I sent lots of details.  If you can't see them then perhaps something is
> buggy with the help system.  The conflicts were either "local add, incoming
> add upon merge" or " local delete, incoming delete upon merge"
> 
> -----Original Message-----
> From: Stefan Sperling [mailto:stsp@elego.de]
> Sent: Wednesday, September 10, 2014 7:32 AM
> To: Andreas Tscharner
> Cc: John Maher; Subversion help
> Subject: Re: Merge problem
> 
> 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.

Mime
View raw message