Add 'merge?' command to trigger a merge detection#222
Open
gosella wants to merge 2 commits intoBaccayarro:masterfrom
Open
Add 'merge?' command to trigger a merge detection#222gosella wants to merge 2 commits intoBaccayarro:masterfrom
gosella wants to merge 2 commits intoBaccayarro:masterfrom
Conversation
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
1 participant
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.
Currently, when a player is about to leave her craft, a detection is performed to warn her of a possible merge.
This PR adds a '/merge?' command to manually trigger this detection (without the need to leave the craft or step at a border).
This could be useful when docking a craft without leaving its bridge.