Re: Merge conflict w/ trunk

On Fri, Oct 2, 2015 at 9:56 AM, Daniel Wu <daniel.s.wu_at_gmail.com> wrote:
>
> 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"?
>

Yes, that will cause problems. Your branch now shares no history with the
trunk, although perhaps individual files do.

You will probably need to do a separate merge for each file now. Or do a
manual invocation of a 3-way merge tool if that also fails.

In the future, create branches as intended: by copying all of trunk. You
can always merge changes in, to get stuff you were missing. Don't ever
re-create or copy over individual files if you want merging to be easy.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-10-05 15:50:32 CEST