Add condition for merge straight #183
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
allierowan
approved these changes
Oct 24, 2017
|
I might hold off on this release for now... I want @mcwhittemore's eyes on the To clarify following questions from @bsudekum, this is adding special handling for a |
mcwhittemore
requested changes
Oct 25, 2017
There was a problem hiding this comment.
Rather then filling in the new merge.straight string with english, we should use the merge.default string from each language and replace the {modifier} with the language's straight word.
This will let translators make a similar change later without effecting the text now.
|
fyi @lyzidiamond I incorporated @mcwhittemore's comment :) @mcwhittemore can I get another 👁 ? |
allierowan
force-pushed
the
merge-straight
branch
from
4b2a493 to
f9d014c
Compare
mcwhittemore
approved these changes
Oct 27, 2017
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.
When the modifier is straight on a merge instruction, instructions should say "merge onto This Highway" instead of "merge straight onto This Highway" because "merge straight" doesn't make any sense.