Changes between Version 77 and Version 78 of DeveloperGuidelines/Git

Timestamp:

12/23/13 09:47:05 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -36 +36 @@
 cd web2py/applications/eden
 
-# Update your working directory with latest code from Trunk
-git pull upstream
+# Update your local repository with latest code from the trunk repository on GitHub
+git pull --rebase upstream
 
 # Write Code
@@ -55 +55 @@
 git commit -am "My Story: Part N"
 
-# Merge latest Trunk
-git pull upstream
+# Pull in changes from trunk
+git pull --rebase upstream
 
 # Resolve any conflicts (see below for how)