diff -r ea553850a74d -r d519f85c008f ContributingCode.wiki --- a/ContributingCode.wiki Thu Jan 14 20:32:21 2016 +0000 +++ b/ContributingCode.wiki Thu Jan 14 20:35:07 2016 +0000 @@ -51,10 +51,10 @@ === Using unnamed branches === -Unnamed branches a.k.a. topological branches, are when the history of commits within a branch (e.g. "default") splits up into alternative chains of commits. +_Unnamed branches_ a.k.a. _topological branches_ happen when the history of commits within a branch (e.g. "default") splits up into alternative commits chains. These alternative chains will have more than one {{{head}}} (at the the end of each chain) within the same branch, until they will be merged back together into a single chain. -In order for us to be able which bugfixes/features of you we merge into the official repository, you should put each in a separate "unnamed branch" as described above. +*In order for us to be able which bugfixes/features of you we merge into the official repository, you should put each in a separate _unnamed branch_ as described above.* Make sure that the first commit of each bugfix/feature commit set is based on a commit from the official repository, that way your bugfixes/features will not depend on the commits of each other and can be merged into official individually, as needed. @@ -65,6 +65,3 @@ You can see example of how unnamed branches and bookmarks are used best [http://hg.hedgewars.org/hw-example-clone/graph here] -ject than a patch and that will take dozens of commits, feel free to use a (named) branch. - -To create a new branch use {{{hg branch}}} followed by the name of the new branch, before committing the first code.