[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Why is test merge different than actual?

From: Greg Creager <greg.creager_at_hp.com>
Date: Fri, 9 Sep 2016 11:06:20 -0700 (PDT)

So we had a test merge to reintegrate a branch that was showing all kinds of conflicts and things we were not expecting (things we already handled on a rebase). Was very confused by what it was showing, yet when I did the actual merge none of those conflicts or changes I was confused by took place, it was as if it was using a different algorithm for the test merge.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3185317

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-09-09 20:16:18 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.