Changes between Version 77 and Version 78 of DeveloperGuidelines/Git


Ignore:
Timestamp:
12/23/13 09:47:05 (8 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v77 v78  
    3636cd web2py/applications/eden
    3737
    38 # Update your working directory with latest code from Trunk
    39 git pull upstream
     38# Update your local repository with latest code from the trunk repository on GitHub
     39git pull --rebase upstream
    4040
    4141# Write Code
     
    5555git commit -am "My Story: Part N"
    5656
    57 # Merge latest Trunk
    58 git pull upstream
     57# Pull in changes from trunk
     58git pull --rebase upstream
    5959
    6060# Resolve any conflicts (see below for how)