On 5/10/06, Sven Brueggemann <SBrueggemann@gmx.net> wrote:
> Dan Climan wrote:
>
> > I had some changes in the trunk version of a file that I was trying to
> > apply to a branch, but the changes keep getting discarded.
>
> What do you mean with "discarded"? Do you get a conflict?
I think what he means is that he wants to merge changes done on the
trunk to his branch. Yet he's running the App TortoiseMerge and
opening files.
>
> > I open TortoiseMerge and put the full path to the trunk version
> > in Base File and put the path to the branch version in My File since
> > this is the one I want to change.
>
> If you're working with TSVN, it's much easier and fail-safe to let
> TSVN invoke TortoiseMerge for you instead of opening it by hand. Simply
> select "Edit conflicts" in the TortoiseSVN context menu of the
> conflicted file. See section 5.6 in the help.
>
I don't think he's even gotten to the point where he'll have conflicts
or not as he's never really doing a merge to begin with, he's just
opening the the files from the branch and trunk in TortoiseMerge.
Dan, if you want to merge changes from the trunk to your branch, the
correct thing to do would be to select the TortoiseSVN->Merge menu in
explorer for the file/folder you want to merge. You don't want to run
the TortoiseMerge app and open the files. TortoiseMerge app is
specifically for hand-merging when you have conflicts. Please read the
help on merging:
http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s17.html
- Jody
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 23:19:57 2006