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

Re: Merge conflict w/ trunk

From: Stefan Hett <stefan_at_egosoft.com>
Date: Fri, 2 Oct 2015 19:46:25 +0200

Hi Daniel,

as a start you could specify what error you get...

> 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
>

-- 
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3140605
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-10-02 19:46:36 CEST

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