On 22.11.2017 00:33, Karl Krasnowsky via TortoiseSVN-dev wrote:
Sorry for the (what i hope is) a very basic question. Scenario...
We have a base preprod (dev) branch, I'll call this dev_branch. I wanted
to perform some relatively large changes to the this project's code
(moving files, deleting outdated, etc.)
So as to not get in the way of others while I did this I generated a
branch off of the dev_branch which I'll call 'dev_restructure".
So I make all my changes locally to dev_restructure (started this
process ~2 days ago, This code doesn't get a lot of traffic, there's
only one other part time dev.
Code has been tested out, etc., it's beautiful. Now I want to
reintegrate it back into dev_branch (which is in the repository, not
local) so that my feature branch trumps what's in the dev_branch, i.e.,
I've deleted/moved some files/folders in my feature branch and want the
results of my merge to represent that in the final result of
'dev_branch'. My feature branch code is updated in the repo, so both
dev_branch and dev_restructure are up to date as well as my local copy
of my feature branch.
Now this is where my confusion comes in... I've tried this...
(I'm on a windows box),
1. From file manager, right click on my working branch folder
(dev_restructure) and select merge from the tortoise options from
the resulting tortoise context menu.
2. Next is the "Merge type" dialog. I'm assuming that I want to "Merge
two different trees" since these are two different branches? at any
rate, this is what I select.
No, these are not two different branches. This is one branch and which
you want to merge to your working copy.
So select "Merge a range of revisions".
3. Next is the 'Tree merge' dialog, this is where I hang up. If I
select "From" as my feature branch and the dev_branch as the ''To"
target, when I run the Test merge from the 'Merge options' dialog it
appears that it's doing exactly opposite of what I want. Hmm, okay,
so let's swap the targets.
4. Now when I perform the test merge I get a bunch of tree conflicts
and the output would seem to be missing some of the added files that
I included in my feature branch.
A test merge will show a lot of possible conflicts. But the real merge
later might be able to resolve those conflicts automatically for you, so
you might not even get a "conflict" at all.
Stefan
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn-dev/16d75ff7-5abe-049e-3584-7451f529247d%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
