Semi-contentless links RSS

Holger's tumble log, collecting floatsom from the web.

Archive

Apr
29th
Thu
permalink
Mar
26th
Fri
permalink
Mar
23rd
Tue
permalink
Nov
9th
Mon
permalink
Clippy arrives for VI

Clippy arrives for VI

Aug
19th
Wed
permalink
permalink
permalink
Aug
13th
Thu
permalink
Aug
12th
Wed
permalink
Aug
10th
Mon
permalink
Jul
6th
Mon
permalink
Suppose you are working on a feature branch copied from your trunk. During the development process you regularly merge ”all” new changes from trunk to your branch so that the branch stays in “synch” with the work occurring on trunk. When you eventually merge your branch back to trunk, that is called a reflective (or cyclic) merge. This type of merge is problematic for Subversion, let’s look at why.
Jun
9th
Tue
permalink
permalink
Jun
8th
Mon
permalink
Jun
4th
Thu
permalink