Changes between Version 34 and Version 35 of CollaborateOnGithub


Ignore:
Timestamp:
01/12/2010 10:44:16 AM (5 years ago)
Author:
mrts
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v34 v35  
    138138git checkout ticket1234
    139139 }}}
    140  1. Merge, fix any conflicts
     140 1. Merge
    141141 {{{
    142142git merge master
     143 }}}
     144 1. If there were any conflicts, handle them by fixing the corresponding files, mark the files as fixed by re-adding them and commit
     145 {{{
     146git add file/that/was/fixed.py
     147git commit
    143148 }}}
    144149 1. [wiki:RunningDjangoTests Run tests]
Back to Top