Github user gilv commented on the pull request:
https://github.com/apache/couchdb/pull/361#issuecomment-167115435
@rnewson : i updated master branch, then merged it with my branch and
pushed the changes.
It seems the merge is a bit weird.. can you explain me what i did wrong?
Here is what i did:
git remote -v
origin https://github.com/gilv/couchdb.git (fetch)
origin https://github.com/gilv/couchdb.git (push)
upstream https://github.com/apache/couchdb.git (fetch)
upstream https://github.com/apache/couchdb.git (push)
git checkout master
git pull upstream master
git push
git checkout store_attachments_external
git fetch origin
git merge origin/master
when i did:
git push origin store_attachments_external - there was an error that i
should pull before.
so i did:
git pull origin store_attachments_external
and then
git push origin store_attachments_external
Now i see that something is wrong and there are commits that has nothing to
do to my code
---
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.
---
