Feature/emergency merge #70
Merged
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
eheimbuch
force-pushed
the
feature/emergency_merge
branch
from
765efb8 to
93480f4
Compare
eheimbuch
force-pushed
the
feature/emergency_merge
branch
from
4ef5689 to
df5e6b9
Compare
pfeuffer
requested changes
May 4, 2020
src/main/java/com/cloudogu/scm/review/pullrequest/service/MergeService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cloudogu/scm/review/pullrequest/service/MergeService.java
Show resolved
Hide resolved
src/main/java/com/cloudogu/scm/review/pullrequest/service/PullRequestService.java
Outdated
Show resolved
Hide resolved
…merge # Conflicts: # src/main/resources/locales/de/plugins.json
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.
Proposed changes
Add the possibility to ignore the workflow engine configuration by performing an "emergency merge".
It is a common merge but since the rules get overwritten there are flags and messages to highlight this merge.
Your checklist for this pull request
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.Checklist for branch merge request (not required for forks)