QA/Execution/Web Testing/Automation/github: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
(Created page with "If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests. # git branch some-new-test # git add test_that_...")
 
No edit summary
 
(6 intermediate revisions by 3 users not shown)
Line 1: Line 1:
If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests.
If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests easier.  


# git branch some-new-test
#git branch some-new-test-branch
# git add test_that_breaks_the_world.py
#git add test_that_breaks_the_world.py  
# git commit -m 'You need this amazing-ness'
#git commit -m 'You need this amazing-ness'  
# git push origin some-new-test
#git push origin some-new-test-branch


Then do the Github pull request as you have already.
Then do the Github pull request as you have already.  


Then once the pull request has been completed do
Then once the pull request has been completed do  


# git merge some-new-test
*''git merge some-new-test''
This merges in your changes to your local master


When done and you want to delete the remote branch do
This merges in your changes to your local master


#git push origin :some-new-test
When done and you want to delete the remote branch do


That deletes the remote copy in your github.
*''git push origin :some-new-test''
 
That deletes the remote copy in your Github.  
 
<br>
 
==Tagging of Projects==
 
Whenever a new version of the site you are working on is released please tag at the same time as the main site. This means that if we need to roll back to a specific version its easy to checkout to that point.
 
To tag do the following
 
# git tag VersionOfProject
# git push --tags

Latest revision as of 14:05, 11 July 2011

If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests easier.

  1. git branch some-new-test-branch
  2. git add test_that_breaks_the_world.py
  3. git commit -m 'You need this amazing-ness'
  4. git push origin some-new-test-branch

Then do the Github pull request as you have already.

Then once the pull request has been completed do

  • git merge some-new-test

This merges in your changes to your local master

When done and you want to delete the remote branch do

  • git push origin :some-new-test

That deletes the remote copy in your Github.


Tagging of Projects

Whenever a new version of the site you are working on is released please tag at the same time as the main site. This means that if we need to roll back to a specific version its easy to checkout to that point.

To tag do the following

  1. git tag VersionOfProject
  2. git push --tags