Github user ansell commented on the issue:
https://github.com/apache/any23/pull/40
Adding the repository that you can push to requires running the following
(where you can name it something different to ``upstream``, you just need to
reuse that name for when you push to it later on:
```git remote add upstream
https://git-wip-us.apache.org/repos/asf/any23.git```
Then you can fetch that repository, just to get its branch/etc. information
into your local copy using:
```git fetch upstream```
Or you can all fetch all remotes at the same time with:
```git fetch --all```
It is a recommendation to always branch when you are working on an issue.
After you create the issue, you run the following to switch to master, update
it to whatever is in the upstream, then start your branch:
```
git checkout master
git merge --ff-only upstream/master
git checkout -b ANY23-NNN
```
Then you commit on that branch and push it back to your github fork using:
```
git commit -a -m "Message goes here"
git push origin ANY23-NNN
```
Then open a pull request on Github so the others can review it.
Then if all is good and you are the one who will merge it back start by
updating your master branch with any changes since you branched:
```
git fetch --all
git checkout master
git merge --ff-only upstream/master
```
Then merge the branch into master:
```
git merge --no-ff ANY23-NNN
```
And then push back to the upstream (which will require your Apache username
and password):
```
git push upstream master
```
If this push fails with a message about a conflict because someone else
pushed in the meantime (unlikely because you updated master just before merging
and pushing, but still possible) then you need to run the following, note the
difference this time to use ``--no-ff`` (no fast forward merging, so it will
create a merge commit as you did above in 6a954ad):
```
git fetch --all
git merge --no-ff upstream/master
git push upstream master
```
HTH
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
