This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Conversation
Contributor
|
Merging. |
|
@redmunds It looks like this got merged directly into master, but we actually only want to merge these into release (and then merge release into master later). It's probably ok since there shouldn't be any conflicts when we re-merge (since the end result of both sets of changes is the same), but just fyi for the future. |
Contributor
|
I couldn't think of any reason to not go right into master, but I guess it could make resolving conflicts harder. |
|
Yeah, it's mostly so we don't have duplicated commits in master. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
ALF created a pull request. Please pull this in.