Changes between Version 3 and Version 4 of WikiStart


Ignore:
Timestamp:
08/17/2016 01:42:12 PM (5 years ago)
Author:
dsowen
Comment:

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

Legend:

Unmodified
Added
Removed
Modified
  • WikiStart

    v3 v4  
    1414cd resistance
    1515}}}
     16
     17Edit source files and commit your changes:
     18
     19{{{
     20echo "# A change!" >> main.py
     21bzr commit -m 'My first change'
     22}}}
     23
     24Your changes are only on your local branch at this point.  If you'd like to submit them upstream, do this:
     25
     26{{{
     27bzr submit -o my-changes.patch
     28}}}
     29
     30Then send `my-changes.patch` to dsowen@fugue88.ws.
     31
     32To get the latest changes from upstream, do this:
     33
     34{{{
     35bzr merge
     36# Resolve any conflicts in your text editor, then:
     37bzr commit
     38}}}