branch from branch
From: maciej <mac610_at_wp.pl>
Date: Sat, 6 Dec 2008 01:20:59 -0800 (PST)
Hello,
I'm having a problem with merging branch which was made of another branch. I made a quick picture of what has happend.
First branch was made from trunk, I was working on it and after some time I made another branch from this branch and I merged trunk to it. Now I need to merge those branches to trunk.
I tried something like this:
2. I tried merging branch 2 (revision B - C) with branch 1 but it caused some internal error.
3. I merged branch 2 (revision D - C) with trunk. It caused some skipped files which I added manually by copying. But I think I might have lost some changes.
Could you advise me what to do best in this situation? I will be very thankful :)
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.