Read Me
Read Me First
This is the software for FRC team 3748
For help getting started with our Distributed Version Control System (DVCS) go
to http://mercurial.selenic.com/guide/
For other questions see our Sourceforge project and the wiki at
https://sourceforge.net/p/frc3748/wiki/Home/
Your typical workflow should be:
1. Navigate to your code directory
> cd frc3748
2. Pull all the changes from Sourceforge
> hg pull
3. Merge any new changes
> hg merge
4. Commit the new changes
> hg commit -m "merged all new changes"
5. Edit your files
> vim somefile.c
> vim anotherfile.c
6. Add any new files to bring them under version control
> hg add
7. Commit your changes
> hg commit -m "New features and bug fixes"
8. Push your changes to Sourceforge for the rest of us to see
> hg push
If the merge is not simple you may have to resolve conflicts. See Mercurial
documentation for help on this.
# ---- vim modeline for text files ----
vim: set expandtab fileformat=dos formatoptions=twn1:
vi: set autoindent tabstop=4 shiftwidth=4: