Fix error introduced by merging branch without updating first#125
Merged
Conversation
isTravis
requested a deployment
to
kalilsn/merge-issue - core PR #125
Render
Abandoned
isTravis
temporarily deployed
to
kalilsn/merge-issue - core PR #125
Render
Destroyed
isTravis
temporarily deployed
to
kalilsn/merge-issue - integration-evaluations PR #125
Render
Destroyed
isTravis
temporarily deployed
to
kalilsn/merge-issue - integration-submissions PR #125
Render
Destroyed
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
3 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.
I refactored this code in my branch, someone else added a new endpoint in a different branch and merged that change, then I merged my branch. This is the scenario that the
Require branches to be up to date before mergingbranch protection rule helps with, but we don't have that since this is an unpaid private repo.For now, I've settled for a reminder option
