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

Merge conflict w/ trunk

From: Daniel Wu <daniel.s.wu_at_gmail.com>
Date: Fri, 2 Oct 2015 10:56:31 -0400

We are trying to merge the branch into the trunk. But we are seeing errors
preventing us from commit. The branch was made prior to the last merge with
the trunk, so it didn't have all the newest and the greatest changes from
the trunk. Instead, we put files manually in the branch with same name and
file extension so it looks like the trunk. Do you think this is causing
trouble? If so, how do we solve this "conflict"?

-- 
Regards
Daniel S. Wu
Tech Lead
WY Consultants LLC
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3140574
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-10-02 19:10:55 CEST

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