How to Begin a Project from the Current Expertiza Repository: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
Line 10: | Line 10: | ||
* If you want more practice using Git and to help out the Expertiza team, you should merge the current upstream master branch back into your project before creating a pull request. | * If you want more practice using Git and to help out the Expertiza team, you should merge the current upstream master branch back into your project before creating a pull request. | ||
<pre> | <pre> | ||
git remote add upstream https://github.com/expertiza/expertiza.git | git remote add upstream https://github.com/expertiza/expertiza.git #Add the upstream remote (expertiza/expertiza) | ||
git fetch upstream | git fetch upstream #Get all current code from upstream | ||
git merge remotes/upstream/master | git merge remotes/upstream/master #Merge upstream with your current branch | ||
</pre> | |||
** Fix merge conflicts -- only keep parts of files that you have changed from your work. Everything else should be kept from upstream. | |||
*** Your code is HEAD, and upstream is a hash (e.g. 3a8fe31). | |||
** Test the merged code to make sure the functionality of your project remains and nothing broke. | |||
** Push your merged code to your forked repository<br> | |||
<pre> | |||
git push origin master | |||
</pre> | </pre> | ||
* When you are finished, [https://help.github.com/articles/using-pull-requests create a pull request] so that your code can be easily merged into Expertiza | * When you are finished, [https://help.github.com/articles/using-pull-requests create a pull request] so that your code can be easily merged into Expertiza | ||
** Please create a pull request message detailing the changes you made in which files for your project. | ** Please create a pull request message detailing the changes you made in which files for your project. |
Revision as of 20:10, 11 February 2013
- Login to Github or create an account.
- Set up Git on your development machine:
- Fork the Expertiza project
- Make your changes, committing often, until your project is complete.
- If you want more practice using Git and to help out the Expertiza team, you should merge the current upstream master branch back into your project before creating a pull request.
git remote add upstream https://github.com/expertiza/expertiza.git #Add the upstream remote (expertiza/expertiza) git fetch upstream #Get all current code from upstream git merge remotes/upstream/master #Merge upstream with your current branch
- Fix merge conflicts -- only keep parts of files that you have changed from your work. Everything else should be kept from upstream.
- Your code is HEAD, and upstream is a hash (e.g. 3a8fe31).
- Test the merged code to make sure the functionality of your project remains and nothing broke.
- Push your merged code to your forked repository
- Fix merge conflicts -- only keep parts of files that you have changed from your work. Everything else should be kept from upstream.
git push origin master
- When you are finished, create a pull request so that your code can be easily merged into Expertiza
- Please create a pull request message detailing the changes you made in which files for your project.