Git: Difference between revisions

From Unallocated Space
Jump to navigation Jump to search
Line 35: Line 35:
<pre>
<pre>
git remote add uas_original https://github.com/Unallocated/RandomScripts.git
git remote add uas_original https://github.com/Unallocated/RandomScripts.git
git fetch uas_original
git fetch uasorigi
git merge uas_original/master
git merge uasorigi/master
</pre>
</pre>
* Create a working Branch for revisions
* Create a working Branch for revisions

Revision as of 18:39, 18 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 uas_original 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