rejected merge branch which was not in remote

Issue #7 open
Boris Gorbylev created an issue

How to reproduce

git clone <repo>
git checkout -b my_branch master
# ... make changes in code ...
git commit -m "my changes"
git checkout master
git merge my_branch
git push origin master

--->

remote: Rejected merge commit: 0f937c5374acc06569bad6a9983ca6651adc5f66
remote: =================================
remote: Merge commits where all parents are from the same branch are not allowed.
remote: =================================

but if push local branch 'my_branch' to remote repo after commit all works fine

Comments (4)

  1. MichaƂ Paluchowski

    Same issue here. Legitimate merges from master are rejected, unless the feature branch gets pushed to remote.

  2. Olivier Refalo

    My call, I don't have any issue with this "issue" - branches should be pushed to the server before they are merged in.

    Update: actually not an issue - the local branch should be merged with the following command 'git rebase mybranch' - remember the intent of this plugin is to have a clean, linear history when possible.

  3. Log in to comment