Stop next change from merging with previous one after inactive period.#530
Merged
JordanMartinez merged 2 commits intoFXMisc:masterfrom Jun 22, 2017
JordanMartinez:preventUndoMergeOnInactivity
Merged
Stop next change from merging with previous one after inactive period.#530JordanMartinez merged 2 commits intoFXMisc:masterfrom JordanMartinez:preventUndoMergeOnInactivity
JordanMartinez merged 2 commits intoFXMisc:masterfrom
JordanMartinez:preventUndoMergeOnInactivity
Conversation
Contributor
Author
|
This PR needs a test to prove that the merge prevention actually occurs. |
Contributor
Author
|
I also realized that the test in UndoManagerTest called |
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.
Addresses #362.
This should really be changed in UndoFX. But since that won't have a new release in the foreseeable future, this can bring the same functionality until such a release exists.