Difference between revisions of "Yade on github"

From Yade

Line 27: Line 27:
 
git commit -am'Commit message' #It can be done several times after every sufficient change
 
git commit -am'Commit message' #It can be done several times after every sufficient change
 
git push origin master #Push you changes into a server
 
git push origin master #Push you changes into a server
git fetch upstream #To pull new updates from the upstream
+
git fetch upstream #Pull new updates from the upstream
  +
git merge upstream/master #Merge upstream changes into your master-branch
   
 
Changes will be pushed to your personal "fork", If you have tested your changes and ready
 
Changes will be pushed to your personal "fork", If you have tested your changes and ready

Revision as of 16:28, 22 March 2012

Using yade on GitHub

Setup

1. Register on github.com

2. Add your SSH key to GitHub[1]:

 On the GitHub site Click “Account Settings” > Click “SSH Public Keys” > Click “Add another public key”

3. Set your username and email:

 git config --global user.name "Firstname Lastname"
 git config --global user.email "your_email@youremail.com"

4. Fork A Repo[2]:

 click the “Fork” button on the https://github.com/yade/trunk

5. Set Up Your Local Repo:

 git clone git@github.com:username/trunk.git

6. Configure remotes:

 git remote add upstream git@github.com:yade/trunk.git
 git fetch upstream

Committing changes

git add .                        #Adds newly created files, if they persist
git commit -am'Commit message'   #It can be done several times after every sufficient change
git push origin master           #Push you changes into a server
git fetch upstream               #Pull new updates from the upstream 
git merge upstream/master        #Merge upstream changes into your master-branch

Changes will be pushed to your personal "fork", If you have tested your changes and ready to push them into the main trunk, just do a "pull request" [3]. After reviewing your changes they will be added to the main trunk.