Now that you have Forked the MetExploreViz Documentation, you can starting making some changes.
A good habit to get into is using topic branches for your work, while keeping the master branch untouched. You can then keep the master branch up-to-date with the main repository without worrying about merge conflicts.
By not working on the master branch, you ensure that the branch's history will not diverge from the main repository's master branch. This allows you to pull in updates from the main repository (origin/incubator-cordova-docs) without merge conflicts.
By creating a topic branch for each contribution, you effectively isolate your changes into a single branch of history. As long as the topic branch is up-to-date, your changes will merge cleanly into the main repository. If your contributions cannot be merged cleanly, the repository maintainer may have to reject your contribution until you update it.
Maintainers like topic branches. It is easier to review the pull request and merge the commit into the main repository
By creating a topic branch for each contribution, you effectively isolate your changes into a single branch of history. As long as the topic branch is up-to-date, your changes will merge cleanly into the main repository. If your contributions cannot be merged cleanly, the repository maintainer may have to reject your contribution until you update it.
By creating a topic branch for each contribution, you effectively isolate your changes into a single branch of history. As long as the topic branch is up-to-date, your changes will merge cleanly into the main repository. If your contributions cannot be merged cleanly, the repository maintainer may have to reject your contribution until you update it.
Consider that you've decided to work on MetExplore ticket #121, which is "Add in the Organism table the NCBI taxonomy table".
$ git checkout master
$ git checkout -b ticket_121
$ git branch
master
* ticket_11
Now, create a topic branch named ticket_121 from master for ticket #121.
You can name the topic branch anything, but it makes sense to name it after the ticket. This topic branch is now isolated and branched off the history of your master branch.
$ [ edit aFile.js ]
$ git status
modified: aFile.js
$ git add aFile.md
$ git status
$ git commit -m "[#121] Add in the Organism table the NCBI taxonomy table."
git add will stage the file changes. You can then commit the staged file(s) with git commit.
Alternatively, you could skip git add and use git commit -am "...."
$ [ edit aFile.md ]
$ git commit -am "[#121] Fix syntax error."
git add will stage the file changes. You can then commit the staged file(s) with git commit.
Alternatively, you could skip git add and use git commit -am "...."
$ git checkout master
$ git pull origin master
$ git checkout ticket_121
$ git rebase master
Before sending the pull request, you should ensure that your changes merge cleanly with the main repository origin/incubator-cordova-docs.
You can do this by pulling the latest changes from the main repository and rebasing the history of the master branch onto the topic branch ticket_121. Essentially, this will fast-forward your topic branch to the latest commit of the master.
Alternatively, you can use git merge master instead of git rebase master, but your topic branches history may not be as clean.
Open a web browser to your Gogs account's fork of the MetExplore2 repository. Select your topic branch so that the pull request references the topic branch.
Since you worked on the topic branch instead of the master branch, you can continue working while waiting for the pull request to go through.
Be sure to create the topic branch from master.
$ git checkout master
$ git pull origin master
$ git checkout -b fix_ugly_bug_example
$ git branch -a
* fix_ugly_bug_example
master
ticket_11
$ git checkout -b master
$ git pull origin master
$ git log
You can now delete your topic branch, because it is now merged into the main repository and in master branch.
$ git branch -d ticket_121
$ git push origin :ticket_121
I know, deleting a remote topic branch is ugly (git push origin :ticket_121).
In this case, you just need to update your branch from the main repository and then address the rejection reason.
$ git checkout master
$ git pull origin master
$ git checkout ticket_121
$ git rebase master
( edit / commit / edit / commit)
$ git push origin ticket_121
Once you are ready, resend the pull request from your Gogs account.