wiki:WikiStart

Version 4 (modified by dsowen, 8 years ago) (diff)

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

resistance

This is a small Python project implementing the game called The Resistance.

It's purpose is to provide a fun way for the Python Utah North group to write AI bots.

Source code

You can get the source directly from the repository with bzr:

cd ~/projects
bzr branch bzr://fugue88.ws/resistance
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