Fix bad merge #286
Merged
Fix bad merge #286
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
|
Tip: to verify a merge, MERGE=eaa297fba49998beca537ad00baf124895f7998a
git checkout $MERGE^1
git merge $MERGE^2
# resolve carefully
git diff $MERGE
# any significant diff? problem |
timja
approved these changes
Mar 20, 2020
This was referenced Mar 20, 2020
bitwiseman
approved these changes
Mar 24, 2020
|
Thanks, Jesse! |
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.
eaa297f (in #273) was a bad merge, reverting critical parts of #269, including the ability to actually enter a secret key for an app.
I would urge anyone who ever resolves a Git merge conflict to use
(why is this not the default?!) or otherwise use a three-way merge tool, and of course check twice.