Changes between Version 11 and Version 12 of HowToContribute

Timestamp:

2011-04-02T13:21:06Z (13 years ago)

Author:

Jakub Jermář

Comment:

Mention the possibility to submit a merge directive.

HowToContribute

@@ -28 +28 @@
  * Choose a [http://trac.helenos.org/wiki/BazaarWorkflow#Youridentity Bazaar identity] and include it in the message so we can correctly attribute you with `--author`. This is important as not everybody wants their real e-mail address to appear in the commit log.
 
-Alternatively you can provide us with a pointer to a public Bazaar branch (e.g. on [https://launchpad.net/ Launchpad]) from where we can pick the changes.
+Alternatively you can provide us with a pointer to a public Bazaar branch (e.g. on [https://launchpad.net/ Launchpad]) from where we can pick the changes. In case you maintain a local branch with your changes and don't want to publish it, we can still merge from it using a Bazaar merge directive. A merge directive can be viewed as a better text patch which carries all the history and change information of your local branch while still being human readable. Once your local branch is ready to be merged, the merge directive can be created as follows:
+
+{{{
+$ bzr send -o my_merge.directive
+}}}
+
+Then send a brief message describing the change to our mailing list and attach ```my_merge.directive``` to it.
 
 == Compiling the system ==