Feature finish should not fail on already merged feature branch. #228 #229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Oups, seems that the second issue (#230) get pulled as well. |
|
Sorry for the confusion, but everything related to #230 should not be pulled. |
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...
|
@rostskadat You can force push to your branch and create a second PR. |
|
@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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is related to #228