thadeusdev · November 5, 2022 18:47 · Oct 7, 2013 · Oct 2, 2013 · Oct 2, 2013 · Oct 2, 2013
diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -29,8 +29,9 @@ Creating the change
 If you want to use git workflow to do code reviews (and are using github), at this point you can create a pull request. Using a pull request, you assign your buddy the task of approving merging your changes (from your feature branch back into master or a release branch). To create the pull request, go to your project on github.com, click "pull requests," then create.
 
 
-Other guy merges in the changes (assuming no pull request)
-==========================================================
+Other guy merges in the changes
+===============================
+(assuming no pull request)
 
     $ git fetch 
 

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -52,6 +52,8 @@ Other guy merges in the changes (assuming no pull request)
 
     $ git branch -d my-feature 
     $ git push origin :my-feature 
+
+If you used the github pull request workflow, at this point, the reviewer should delete the feature branch.
 
 Other useful commands
 =====================

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -12,9 +12,9 @@ Creating the change
 
     $ git commit -a -m "my feature is this"
 
-... then pull in changes from master since we branched, and re-apply ours on top...
+... then fetch changes from master since we branched, and re-apply ours on top...
 
-    $ git pull
+    $ git fetch
     $ git rebase master
 
 ... Also fine to merge here instead of rebase (but rebasing is better because makes it easier for others!). Resolve conflicts (if any) and add them ... 
@@ -32,7 +32,7 @@ If you want to use git workflow to do code reviews (and are using github), at th
 Other guy merges in the changes (assuming no pull request)
 ==========================================================
 
-    $ git pull 
+    $ git fetch 
 
 ... list branches
 

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -26,8 +26,11 @@ Creating the change
 
     $ git push origin my-feature 
 
-Other guy merges in the changes
-===============================
+If you want to use git workflow to do code reviews (and are using github), at this point you can create a pull request. Using a pull request, you assign your buddy the task of approving merging your changes (from your feature branch back into master or a release branch). To create the pull request, go to your project on github.com, click "pull requests," then create.
+
+
+Other guy merges in the changes (assuming no pull request)
+==========================================================
 
     $ git pull 
 

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -15,9 +15,9 @@ Creating the change
 ... then pull in changes from master since we branched, and re-apply ours on top...
 
     $ git pull
-    $ git rebase master  
-
-... resolve conflicts (if any) and add them ... 
+    $ git rebase master
+    
+... Also fine to merge here instead of rebase (but rebasing is better because makes it easier for others!). Resolve conflicts (if any) and add them ... 
 
     $ git add <filename>
     $ git rebase --continue

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -12,7 +12,7 @@ Creating the change
 
     $ git commit -a -m "my feature is this"
 
-... then pull in changes from master since we branched, and re-apply ours on top. Also fine to merge here instead of rebase (but rebasing is better because makes it easier for others!) ...
+... then pull in changes from master since we branched, and re-apply ours on top...
 
     $ git pull
     $ git rebase master  

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -12,7 +12,7 @@ Creating the change
 
     $ git commit -a -m "my feature is this"
 
-... pulls in changes from master since we branched, then re-apply ours on top. Totally fine to merge here instead of rebase ...
+... then pull in changes from master since we branched, and re-apply ours on top. Also fine to merge here instead of rebase (but rebasing is better because makes it easier for others!) ...
 
     $ git pull
     $ git rebase master  

diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -1,54 +1,58 @@
 Creating the change
-$ git checkout -b my-feature
+===================
+
+    $ git checkout -b my-feature
 
 ... modify code ....
 
-$ git add <filename>
-$ git commit -m “my feature is this”
+    $ git add <filename> 
+    $ git commit -m “my feature is this”
+
+... or, if you're lazy ...
+
+    $ git commit -a -m "my feature is this"
 
 ... pulls in changes from master since we branched, then re-apply ours on top. Totally fine to merge here instead of rebase ...
 
-$ git pull
-$ git rebase master  
+    $ git pull
+    $ git rebase master  
 
 ... resolve conflicts (if any) and add them ... 
 
-$ git add <filename>
-$ git rebase --continue
+    $ git add <filename>
+    $ git rebase --continue
 
 ... # push my branch back to the server
 
-$ git push origin my-feature 
+    $ git push origin my-feature 
+
 Other guy merges in the changes
+===============================
 
-$ git pull 
+    $ git pull 
 
 ... list branches
 
-$ git branch -a
+    $ git branch -a
 
 ... bring a branch local
 
-$ git branch --track my-feature origin/my-feature
-$ git checkout master
-$ git merge my-feature
-$ git push
+    $ git branch --track my-feature origin/my-feature
+    $ git checkout master
+    $ git merge my-feature
 
 ... resolve conflicts and look around ...
 
-... delete branch (and remote branch) when done
+    $ git push
 
-$ git branch -d my-feature 
-$ git push origin :my-feature 
+... delete branch (and remote branch) when done
 
+    $ git branch -d my-feature 
+    $ git push origin :my-feature 
 
 Other useful commands
-To remove remote branches from your list after they have been deleted by other people
-
-$ git remote prune origin
-
-
-
-
+=====================
 
+To remove remote branches from your list after they have been deleted by other people
 
+    $ git remote prune origin
diff --git a/git-collaborative-workflow.md b/git-collaborative-workflow.md
@@ -0,0 +1,54 @@
+Creating the change
+$ git checkout -b my-feature
+
+... modify code ....
+
+$ git add <filename>
+$ git commit -m “my feature is this”
+
+... pulls in changes from master since we branched, then re-apply ours on top. Totally fine to merge here instead of rebase ...
+
+$ git pull
+$ git rebase master  
+
+... resolve conflicts (if any) and add them ... 
+
+$ git add <filename>
+$ git rebase --continue
+
+... # push my branch back to the server
+
+$ git push origin my-feature 
+Other guy merges in the changes
+
+$ git pull 
+
+... list branches
+
+$ git branch -a
+
+... bring a branch local
+
+$ git branch --track my-feature origin/my-feature
+$ git checkout master
+$ git merge my-feature
+$ git push
+
+... resolve conflicts and look around ...
+
+... delete branch (and remote branch) when done
+
+$ git branch -d my-feature 
+$ git push origin :my-feature 
+
+
+Other useful commands
+To remove remote branches from your list after they have been deleted by other people
+
+$ git remote prune origin
+
+
+
+
+
+
No results found