Differences

This shows you the differences between two versions of the page.

--- git_github_workflow [2020/01/27 14:58] – [Contributing changes] rpjday
+++ git_github_workflow [2020/01/27 17:03] (current) – [Clone your personal fork to your local machine] rpjday
@@ Line 21: / Line 21: @@
 ==== Clone your personal fork to your local machine ====
-Once you've made that personal GitHub fork (agin, in my case, ''rpjday/libpod''), you need to make one more copy of the repository -- this one will be clone of your personal fork to your //local// machine, which represents the working tree in which you create new branches and make local changes that you'll push to your GitHub fork for eventual incorporation into the public project, but here's the trick for clarity.
+Once you've made that personal GitHub fork (agin, in my case, ''rpjday/libpod''), you need to make one more copy of the repository -- this one will be a clone of your personal fork to your //local// machine, which represents the working tree in which you create new branches and make local changes that you'll push to your GitHub fork for eventual incorporation into the public project, but here's the trick for clarity.
 Since you'll (shortly) be working with two remotes for this workflow, when you clone your personal fork, select a remote name other than the default of ''origin'' -- I'll use the remote name of ''rpjday'' to clearly identify that this is the remote corresponding to my personal fork over at GitHub, not the public project:
@@ Line 28: / Line 28: @@
 $ mkdir podman/libpod
 $ cd podman/libpod
-$ git clone https://github.com/rpjday/libpod git
+$ git clone -o rpjday https://github.com/rpjday/libpod git
 </code>
@@ Line 133: / Line 133: @@
 ==== Making some local changes ====
+For each set of related changes, start a new feature branch with a distinct name that reflects what that branch is doing:
 <code>
-$ git checkout -b topic/rpjday/issue42
+$ git checkout -b rpjday/README_changes
-Switched to a new branch 'topic/rpjday/issue42'
+Switched to a new branch 'rpjday/README_changes'
 $
 </code>
-Make a simple change to ''README.asc'' and commit it:
+For our example, make some trivial changes to the top-level ''README.md'' file, and locally commit those changes on that branch:
 <code>
-$ git checkout -b topic/rpjday/issue42
+$ git commit -a -m "README.md: silly changes"
-Switched to a new branch 'topic/rpjday/issue42'
+[rpjday/README_changes b1a09348] README.md: silly changes
+file changed, 4 insertions(+)
 $
 </code>
+==== Pushing your work ====
+You can continue adding and committing (related) work to this feature branch and, once you're satisfied, you can push that branch to your personal GitHub fork with:
 <code>
-$ git commit -a -m "fix issue42"
+$ git push rpjday rpjday/README_changes
-[topic/rpjday/issue42 77fad5f] topic/rpjday/issue42
-file changed, 1 insertion(+), 1 deletion(-)
-$
 </code>
-<code>
+==== And over At GitHub ====
-$ git show
-commit 77fad5f0aadd229628baa7811b0b49c7580d96f0 (HEAD -> topic/rpjday/issue42)
-Author: Robert P. J. Day <rpjday@crashcourse.ca>
-Date:   Wed Feb 14 07:06:42 2018 -0500
-    fix issue42
+Provided you're logged into your account at GitHub, you'll suddenly see the appearance of a new branch ''rpjday/README_changes''. If you think it's ready to go, you can select "Compare & pull request" to examine and confirm that you want to hand that off to the main project.
-diff --git a/README.asc b/README.asc
+If all goes well and your change is accepted and committed (in this case, into the ''master'' branch), you will have to perform the two earlier steps to fetch and merge your changes into your local clone into the ''master'' branch:
-index d7810fd..126bfd4 100644
---- a/README.asc
+<code>
-+++ b/README.asc
+$ git fetch libpod
-@@ -1,4 +1,4 @@
+$ git merge libpod/master
--= Pro Git, Second Edition
-+= Pro Git, Second Edition (rday change)
- Welcome to the second edition of the Pro Git book.
-$
 </code>
-At this point, you can push this new branch to your GitHub fork:
+In addition, if you have no further need of that local feature, you can delete it:
 <code>
-$ git push origin topic/rpjday/issue42
+$ git branch -d rpjday/README_changes
 </code>
-==== And over At GitHub ====
+==== Adjusting your local branch ====
-Provided you're logged into your account at GitHub, you'll suddenly see the appearance of a new branch ''sillyb''. If you think it's ready to go, you can select "Compare & pull request" to examine and confirm that you want to hand that off to the main project.
-If all goes well and your change is accepted and committed, you will have to perform the two earlier steps to fetch and merge your changes into your local clone into the ''master'' branch:
+Given the possibility that your pull request might provoke some comments about possible improvements, you can make those local improvements, stage them and commit them on the same branch as before, then force push that branch to replace the older one:
 <code>
-$ git fetch progit
+$ git push -f rpjday rpjday/README_changes
-$ git merge progit/master
 </code>
-In addition, you can now delete the ''sillyb'' branch if you have no further use for it.