Mercurial Mercurial > hwkb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Edited via web interface
authorsheepluva
Thu, 14 Jan 2016 20:45:45 +0000
changeset 727 8c4a065a898c
parent 726 67653ea060f2
child 728 1b0f7b17e748
Edited via web interface
ContributingCode.wiki file | annotate | diff | comparison | revisions 
--- 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"._
hwkb