Differences

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

--- git_and_github_notes [2018/03/04 08:30] – created jtkorb
+++ git_and_github_notes [2018/03/04 11:43] (current) – [Pull Requests from the Command Line] jtkorb
@@ Line 9: / Line 9: @@
 then, push changes to origin and request pull from upstream master:
   git push origin
-  git request-pull abc1234 upstream master
+  git request-pull SOMETHING https://github.com/start-concurrent/start-concurrent.github.io.git
 ===== Accepting Pull Requests from the Command Line =====
-to be added
+Step 1: From your project repository, check out a new branch and test the changes.
+  git checkout -b jtkorb-master master
+  git pull https://github.com/jtkorb/jtkorb.github.io.git master
+Step 2: Merge the changes and update on GitHub.
+  git checkout master
+  git merge --no-ff jtkorb-master
+  git push origin master