Daniel K. Theemann

As a developer you often merge branches into the trunk when developing software, where the branch and trunk is fully synched. This scenario usually not give any problems when merging, here you can just use the svn –reintegrate.

But when you are going to merge an unsynched branch into the trunk, different problems will come up. Usually you have to deal with:

1. What revision to merge from?
2. Conflicts to resolve “manually” (you have tools to assist you, but never trust them entirely. Always check their merge results before commit)

To resolve problem 1, you can use the following command:

svn log --stop-on-copy -r1:HEAD the URL to your branch --limit 1
------------------------------------------------------------------------
r685 | dkt | 2008-08-18 16:02:43 +0200 (Mon, 18 Aug 2008) | 1 line
------------------------------------------------------------------------

Now I know what revision to merge from, so I can merge with the following svn command:

svn merge -r 685:HEAD URL to your branch

Finally, you have to resolve your conflicts manually…

So my point is, either try to keep your branched fully synched with the trunk, then merging is going less painful or use the scenario presented above.

Please comment with your experiences or disagreements to my post.

Possibly Related Posts:

The time has come, where my girlfriend Lisbeth and I leave Vejle and instead move back to our childhood roots, which is Aabenraa. I leave Vejle with a lot of great memories and experiences. Especially all the great people I had the pleasure to play soccer with in Vejle FC and Vejle Kammeraterne and study with in Vejle.

From Spring 2009 I will start my coaching career in my childhood club AaBK, where I will be coaching U12 boys. This will be my first job as a coach and I am looking forward to give some of my, now 22 years of, experience as a soccer player on to these boys.

Our new house is still under renovation, so we have to stay at Lisbeth’s parent’s place for some days or maybe weeks. We will see!

With regard to my current work situation, I will of course continue as a developer at Pharma Nord, but my office will be moved from Vejle to Vojens (from 24th. November).

See you!

Possibly Related Posts:

• Pokal: U14.1 (1 – 7) Vejle B
• U14.1 (1 – 3) Kolding FC
• Pokal: Dybbøl (3) 4 – 7 (3) U14.1
• U14.1 (10 – 5) Grindsted GIF
• Haderslev FK (4 – 0) U14.1