Changes between Version 30 and Version 31 of GitForDarcsUsers


Ignore:
Timestamp:
Apr 3, 2011 10:49:03 PM (4 years ago)
Author:
basvandijk
Comment:

fix typo

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v30 v31  
    3232Note that Git branches all exist in the same repository.  You can have several physical clones of the same repository like in Darcs, but it is often more convenient to work with multiple branches in the same directory.  The most important commands for working with branch are {{{git checkout}}} and {{{git branch}}}, see below.
    3333
    34 The typical Git workflow is to use one branch per feature and merge into their original branch once they are considered ready.  For example, if we think ready that "feature1" is ready, we can {{{git merge}}} it into master:
     34The typical Git workflow is to use one branch per feature and merge into their original branch once they are considered ready.  For example, if we think that "feature1" is ready, we can {{{git merge}}} it into master:
    3535{{{
    3636$ git checkout develop   # switch to develop branch