Git: Difference between revisions

From Unallocated Space
Jump to navigation Jump to search
Line 16: Line 16:
git add -v .
git add -v .
git commit -m "i did this"
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
<pre>
**** HOW? ****
</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
git push
</pre>
</pre>

Revision as of 20:02, 17 March 2014

UAS has Git repositories on github: https://github.com/Unallocated

Contributing to a UAS GitHub Project

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
**** HOW? ****
  • 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