Jump to navigation Jump to search
1,860 bytes added ,  11:13, 29 September 2014
added a short tutorial how to push a new feature
Check out the links at the end of the page for more git options.
===Developing a new feature or bug fix using git===
It is always a good idea to create a new branch for a new feature or a big fix you are working on. So first, let's make sure you have the most up-to-date source code. We assume, that you added BaseX as upstream repository as described above and you are currently in the ''master'' branch:
<pre class="brush:shell">
$ git pull upstream master
Now, we create a new branch, based on the master branch
<pre class="brush:shell">
$ git checkout -b new-feature
Switched to a new branch 'new-feature'
Your are now automatically switched to the ''new-feature'' branch. Now you can make all your changes in one or several commits. You can commit all changes using
<pre class="brush:shell">
$ git commit -a
Now, you want to push these changes to the repository on GitHub. Remember, that up to now your changes just reside on your local drive, so now you want to push it to your remote fork of BaseX. Simply do:
<pre class="brush:shell">
$ git push origin new-featuCounting objects: 318, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (107/107), done.
Writing objects: 100% (154/154), 22.96 KiB | 0 bytes/s, done.
Total 154 (delta 93), reused 81 (delta 26)
* [new branch] new-feature -> new-featurere
You can now use your web browser and go to your fork of BaseX. You will see the following message:
You can now click the "Compare & pull request" button. You can now review the changes you are going to push.
'''Please review them carefully. Also, please give a meaningful comment so we can quickly determine what your changes are doing.''' After clicking the "Create Pull request" button you are done and we will review your changes and either merge the pull request or get back to you.
==Need help using git?==
administrator, editor


Navigation menu