Git

From Unallocated Space
Jump to navigation Jump to search

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

Contributing to a UAS GitHub Project

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

I'm not sure which way is better.

Method 1) is much simpler, but requires signing in to GitLab to get a new Fork.

Method 2) seems to work and updates can be pulled without signing in to GitLab.

**** Method 1) Fork the Project, Just In Time, and Pull It ****
> GitLab Web -> FORK
git pull

**** Method 2) Separate Fetch/Push Remotes ****
git remote rm origin
git remote add origin https://github.com/Unallocated/RandomScripts.git
git remote set-url --push origin https://github.com/Tektite/RandomScripts.git
git pull origin 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