Only show meaningful changes in other branches #197
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
… branch, but is the same as main, it has been reverted, and it safe to checkout and make changes to.
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.
Changes the status branch behavior, currently if there's a change in another branch, and that change gets reverted, it will still show as a 'difference' because we're using the log command
This change uses the intersection of the log and diff commands to better filter down for actual changes
We first run a log to find files which have had commits in other branches, then we diff those against status branch 0
So if a file is changed, and then reverted, the diff will show no changes, meaning either the same change has already been applied on main, or the change was since reverted in that branch
Prior to this change, if you change a file, and then decide against that change and revert it, the editor will continue to prevent you checking out that file in other branches
Our workflow at The Three Thousands uses "Main" as status branch 0, and all work is done in feature branches, that may not be the intention for this plugin (Though I imagine it is, given there's an option to "Diff Against Status Branch" which simply diffs against status branch 0) - if this doesn't conform to the expected workflow of the plugin, this change may not be suitable to merge.