{"id":2048,"date":"2018-01-22T16:03:40","date_gmt":"2018-01-22T21:03:40","guid":{"rendered":"http:\/\/lisa.rushworth.us\/?p=2048"},"modified":"2018-01-22T16:03:40","modified_gmt":"2018-01-22T21:03:40","slug":"git-pull-requests","status":"publish","type":"post","link":"https:\/\/www.rushworth.us\/lisa\/?p=2048","title":{"rendered":"Git Pull Requests"},"content":{"rendered":"

I have finally run through the process of submitting a pull request to suggest changes to a Git repository. Do the normal ‘stuff’ either to make a new project or to clone an existing project to your computer. Create a new branch and check out that branch.<\/p>\n

C:\\ljr\\git>git clone https:\/\/github.com\/ljr55555\/SampleProject<\/b><\/p>\n

Cloning into ‘SampleProject’…<\/p>\n

remote: Counting objects: 4, done.<\/p>\n

remote: Compressing objects: 100% (3\/3), done.<\/p>\n

remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0<\/p>\n

Unpacking objects: 100% (4\/4), done.<\/p>\n

C:\\ljr\\git>cd SampleProject<\/p>\n

\n

C:\\ljr\\git\\SampleProject>git branch newEdits<\/b><\/p>\n

\n

C:\\ljr\\git\\SampleProject>git checkout newEdits<\/b><\/p>\n

Switched to branch ‘newEdits’<\/p>\n

Make some changes and commit them to your branch<\/p>\n

C:\\ljr\\git\\SampleProject>git add helloworld.pl<\/b><\/p>\n

C:\\ljr\\git\\SampleProject>git commit -m “Added hello world script”<\/b><\/p>\n

C:\\ljr\\git\\SampleProject>git push origin newEdits<\/b><\/p>\n

Counting objects: 3, done.<\/p>\n

Delta compression using up to 4 threads.<\/p>\n

Compressing objects: 100% (3\/3), done.<\/p>\n

Writing objects: 100% (3\/3), 408 bytes | 408.00 KiB\/s, done.<\/p>\n

Total 3 (delta 0), reused 0 (delta 0)<\/p>\n

To https:\/\/github.com\/ljr55555\/SampleProject<\/p>\n

\u00a0* [new branch]\u00a0\u00a0\u00a0\u00a0\u00a0 newEdits -> newEdits<\/p>\n

On the GitHub site, click the \u201cnew pull request\u201d button. Since you select the two branches within the pull request, it doesn\u2019t seem to matter which branch\u2019s \u201cPull request\u201d tab you select.<\/p>\n

\"\"<\/a><\/p>\n

Select the source branch and the one with your changes. Verify you can merge the branches (otherwise you\u2019ve got a problem and need to resolve conflicts). Review the changes, then click \u201cCreate pull request\u201d<\/p>\n

\"\"<\/a><\/p>\n

Here\u2019s another place for comments \u2013 comments on the pull request, not the commit comments. Click \u201cCreate pull request\u201d.<\/p>\n

\"\"<\/a><\/p>\n

Click \u201cCreate pull request\u201d and you\u2019ve got one! Now what do we do with it (i.e. if you\u2019re the repository owner and receive<\/i> a pull request). If you check the \u201cPull request\u201d tab on your project, you should see one now.<\/p>\n

\"\"<\/a><\/p>\n

Click on it to explore the changes that have been made \u2013 the \u201cCommits\u201d tab will have the commits, and the \u201cFiles changed\u201d tab will show you the specific changes that have been made.<\/p>\n

\"\"<\/a><\/p>\n

You could just comment and close the pull request (if, for instance, there was a reason<\/i> you had not implemented the project that way and do not wish to incorporate the changes into your master branch). Assuming you do<\/i> wish to incorporate the code, there are a couple of ways you can merge the new code into your base branch. The default is generally a good, or read the doc at https:\/\/help.github.com\/articles\/about-pull-request-merges\/<\/a><\/p>\n

\"\"<\/a><\/p>\n

Select the appropriate merge type and click the big green button. You have an opportunity to edit the commit message at this point, or just click \u201cConfirm merge\u201d<\/p>\n

\"\"<\/a><\/p>\n

Voila, it is merged in. You can write some comment to close out the pull request.<\/p>\n

\"\"<\/a><\/p>\n

There is a notification that the request was completed and the branch can be deleted.<\/p>\n

\"\"<\/a><\/p>\n

And the project no longer has any open pull requests (you can remove the \u201cis open\u201d filter and see the request again).<\/p>\n

\"\"<\/a><\/p>\n

And finally, someone should delete the branch. Is that the person who created the branch? Is that the person who maintains the repository? No idea! I\u2019d delete my own, to keep things tidy \u2026 but I wouldn\u2019t be offended if the maintainer deleted it either.<\/p>\n

\"\"<\/a><\/p>\n

 <\/p>\n

\n","protected":false},"excerpt":{"rendered":"

I have finally run through the process of submitting a pull request to suggest changes to a Git repository. Do the normal ‘stuff’ either to make a new project or to clone an existing project to your computer. Create a new branch and check out that branch. C:\\ljr\\git>git clone https:\/\/github.com\/ljr55555\/SampleProject Cloning into ‘SampleProject’… remote: Counting …<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[33],"tags":[233,494,495],"class_list":["post-2048","post","type-post","status-publish","format-standard","hentry","category-coding","tag-git","tag-github","tag-pull-request"],"_links":{"self":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/2048","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2048"}],"version-history":[{"count":1,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/2048\/revisions"}],"predecessor-version":[{"id":2060,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/2048\/revisions\/2060"}],"wp:attachment":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2048"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2048"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2048"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}