Git: Difference between revisions
Jump to navigation
Jump to search
(Submitting Pull Request Workflow added) |
|||
| (13 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
UAS has Git repositories on github: https://github.com/Unallocated | UAS has Git repositories on github: https://github.com/Unallocated | ||
== Contributing to a Project | == Contributing to a UAS GitHub Project == | ||
* Submit Pull Request | <span style="font-size:x-small;">Updated Mar 18, 2014</span><br /> | ||
The following procedures are designed for first timers. Note: The author is a first timer and this is how he did it the First Time! | |||
==== Prerequisites ==== | |||
* GIT is installed on your PC. [http://www.git-scm.org GIT Home Page] | |||
* You have created a GitHub account. | |||
* You want to contribute to an existing UAS project on GitHub | |||
=== Cloning the Repository and Submitting Pull Request Workflow === | |||
* Sign In to GitHub | |||
* Navigate to the UAS Project | |||
* Click "Fork" in the top right | |||
This creates a clone of the UAS project in your GitHub account's namespace. | |||
* Clone your GitHub Fork to your local PC | |||
For example, the Tektite user on GitHub clones the Fork with the following git clone command | |||
<pre> | |||
git clone https://github.com/Tektite/RandomScripts.git /c/UAS.g/RandomScripts.f | |||
</pre> | |||
* Create, Change, Add, Commit - then Push back to GitHub | |||
<pre> | |||
... work on stuff ... | |||
git add -v . | |||
git commit -m "i did this" | |||
git push | |||
</pre> | |||
* Submit Pull Request in GitHub | |||
<pre> | |||
Go to your copy again in the web interface | |||
Click "Pull Request" under commits/branches/releases/contributors bar | |||
Someone with write access to the repo can then review it for inclusion | |||
</pre> | |||
=== Updating Your Contribution Workflow === | |||
* Update your local copy by adding a remote to the main GitHub project repository then pull/merge it | |||
<pre> | |||
git remote add uasorigi https://github.com/Unallocated/RandomScripts.git | |||
git fetch uasorigi | |||
git merge uasorigi/master | |||
</pre> | |||
* Create a working Branch for revisions | |||
<pre> | |||
git checkout -b MyRevs | |||
... do revisions and work on stuff ... | |||
</pre> | |||
* Add and Commit the Branch | |||
<pre> | |||
git add -v . | |||
git commit -m "My new revs" | |||
</pre> | |||
* Merge the working Branch with the Master Branch | |||
<pre> | |||
git checkout master | |||
git merge MyRevs | |||
</pre> | |||
* Push your work to your project Fork on GitHub | |||
<pre> | |||
git push | |||
</pre> | |||
* Submit Pull Request in GitHub | |||
<pre> | <pre> | ||
Go to your copy again in the web interface | Go to your copy again in the web interface | ||
Click "Pull Request" under commits/branches/releases/contributors bar | Click "Pull Request" under commits/branches/releases/contributors bar | ||
Someone with write access to the repo can then review it for inclusion | Someone with write access to the repo can then review it for inclusion | ||
</pre> | </pre> | ||
== Projects == | |||
<hr /> | |||
=== Projects === | |||
<span style="font-size:x-small;">This is an unallocated artifact from the original author of this wiki page.</span> | |||
* Create repository for various services. | * Create repository for various services. | ||
** Example: place to put latest code for [[Member_Check-In_System]] | ** Example: place to put latest code for [[Member_Check-In_System]] | ||
Latest revision as of 17:21, 26 March 2014
UAS has Git repositories on github: https://github.com/Unallocated
Contributing to a UAS GitHub Project
Updated Mar 18, 2014
The following procedures are designed for first timers. Note: The author is a first timer and this is how he did it the First Time!
Prerequisites
- GIT is installed on your PC. GIT Home Page
- You have created a GitHub account.
- You want to contribute to an existing UAS project on GitHub
Cloning the Repository and Submitting Pull Request Workflow
- Sign In to GitHub
- Navigate to the UAS Project
- Click "Fork" in the top right
This creates a clone of the UAS project in your GitHub account's namespace.
- Clone your GitHub Fork to your local PC
For example, the Tektite user on GitHub clones the Fork with the following git clone command
git clone https://github.com/Tektite/RandomScripts.git /c/UAS.g/RandomScripts.f
- Create, Change, Add, Commit - then Push back to GitHub
... work on stuff ... git add -v . git commit -m "i did this" git push
- Submit Pull Request in GitHub
Go to your copy again in the web interface Click "Pull Request" under commits/branches/releases/contributors bar Someone with write access to the repo can then review it for inclusion
Updating Your Contribution Workflow
- Update your local copy by adding a remote to the main GitHub project repository then pull/merge it
git remote add uasorigi https://github.com/Unallocated/RandomScripts.git git fetch uasorigi git merge uasorigi/master
- Create a working Branch for revisions
git checkout -b MyRevs ... do revisions and work on stuff ...
- Add and Commit the Branch
git add -v . git commit -m "My new revs"
- Merge the working Branch with the Master Branch
git checkout master git merge MyRevs
- Push your work to your project Fork on GitHub
git push
- Submit Pull Request in GitHub
Go to your copy again in the web interface Click "Pull Request" under commits/branches/releases/contributors bar Someone with write access to the repo can then review it for inclusion
Projects
This is an unallocated artifact from the original author of this wiki page.
- Create repository for various services.
- Example: place to put latest code for Member_Check-In_System