Re: Merge conflict w/ trunk

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