diff -r 67653ea060f2 -r 8c4a065a898c ContributingCode.wiki --- a/ContributingCode.wiki Thu Jan 14 20:39:10 2016 +0000 +++ b/ContributingCode.wiki Thu Jan 14 20:45:45 2016 +0000 @@ -15,7 +15,10 @@ TODO === Using (named) branches === -Branches are alternative commit histories. Changes done in one branch can be merged into other branches as needed. +Branches are alternative commit histories. + +The commits history from one branch, up to any commit, can be merged into other branches when needed. +Note: In Mercurial merging a commit always means to also merge all its ancestor commits. _Most main development happens on the main repository branch "default"._