Changes between Version 3 and Version 4 of WikiStart

Timestamp:

08/17/2016 01:42:12 PM (8 years ago)

Author:

dsowen

Comment:

Instructions for committing, submitting patches, and merging from upstream.

WikiStart

@@ -14 +14 @@
 cd resistance
 }}}
+
+Edit source files and commit your changes:
+
+{{{
+echo "# A change!" >> main.py
+bzr commit -m 'My first change'
+}}}
+
+Your changes are only on your local branch at this point.  If you'd like to submit them upstream, do this:
+
+{{{
+bzr submit -o my-changes.patch
+}}}
+
+Then send `my-changes.patch` to dsowen@fugue88.ws.
+
+To get the latest changes from upstream, do this:
+
+{{{
+bzr merge
+# Resolve any conflicts in your text editor, then:
+bzr commit
+}}}