Skip to content

Conversation

@chrispySalad
Copy link
Contributor

No description provided.

@schroepf
Copy link
Member

this PR seems to have the same issues as #98 ... it also contains a merge commit which merges master and all of the release merge commits into your feature branch:

Bildschirmfoto 2020-04-20 um 15 45 14

@schroepf
Copy link
Member

You should be able to fix this PR branch with the same steps as the other one:

$ git checkout develop
$ git reset --hard 1ba39628b9ebe6dc54e48717f16296c2cbe1bad6
$ git pull
# now your develop branch should be in sync with the remote branch in github
$ git branch -D work/issue_47
$ git checkout -b work/issue_47
$ git cherry-pick 458b3f6435d8b68b13b4c37db95fa868e31ef41e
$ git push --force

the git reset --hard is only necessary if you didn't perform the steps in PR #100 yet... otherwise your develop branch should already be clean...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants