Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Why is test merge different than actual?

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Why is test merge different than actual?

Author macpharlan
Full name Greg Creager
Date 2016-09-09 11:06:20 PDT
Message 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.

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

Why is test merge different than actual? macpharlan Greg Creager 2016-09-09 11:06:20 PDT
Messages per page: