Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature finish should not fail on already merged feature branch. #228 #229

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

rostskadat
Copy link

This is related to #228

@rostskadat
Copy link
Author

Oups, seems that the second issue (#230) get pulled as well.
The idea was to be able to split each issue in its own pull request.

@rostskadat
Copy link
Author

Sorry for the confusion, but everything related to #230 should not be pulled.

AF090536 added 2 commits April 30, 2020 19:35
…OM commit

After the user has solved the conflicts that appeared during the first
hotfix-finish, it should be possible to restart the hotfix-finish
without failing. The first fix is that if we are tagging (skipTag=false)
we should allow the user to avoid failing. Since the tagging happened on
master before possible merge fail on develop, we would fail when tagging
the second time around. The second failure fix is to make sure that the
development version is not incremented indiscriminately.
There is one last problem, which is not solved yet: the fact that if we
have a conflict when merging on develop, we should backtrack the commit
were we set the version to hotfix branch...
@aleksandr-m
Copy link
Owner

@rostskadat You can force push to your branch and create a second PR.

@aleksandr-m
Copy link
Owner

@rostskadat Hey. Do you still need this? Can you clean this up so I can review it.

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.

2 participants