Allow for merge conflicts in Merge-Branch.ps1#31726
Merged
Merged
Conversation
hallipr
requested review from
JimSuplizio,
Netyyyy,
backwind1233,
benbp,
chenrujun,
fangjian0423,
hui1110,
moarychan,
saragluna,
stliu,
weshaggard and
yiliuTo
as code owners
October 25, 2022 22:38
ghost
added
the
weshaggard
reviewed
Oct 25, 2022
| git merge $SourceBranch --no-ff --no-commit | ||
| if ($LASTEXITCODE) { ErrorExit $LASTEXITCODE } | ||
| git merge $SourceBranch --no-ff --no-commit | Tee-Object -Variable mergeOutput | ||
| if ($LASTEXITCODE -and -not $mergeOutput.EndsWith('Automatic merge failed; fix conflicts and then commit the result.')) { ErrorExit $LASTEXITCODE } |
Member
There was a problem hiding this comment.
Do we need to fail below if there is a merge failure still?
Member
Author
There was a problem hiding this comment.
If there's a failure other than the expected "fix conflicts" we should error exit with the "Unknown state, git reset --hard" message
If there's an exit code, but git's telling us to fix our conflicts and commit, then we're in an expected state and we should just continue as usual
weshaggard
approved these changes
Oct 25, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Merge-Branch was exiting out if
git mergereturned a non-zero exit code. Because it returns exit code 1 when it detects merge-conflicts, I added a command output test looking for specific valid error output.