feat: add conflict descriptions and file sync context menu #126
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
This was referenced Mar 28, 2025
deansheather
approved these changes
Apr 1, 2025
ethanndickson
changed the base branch from
ethan/fss-restarts
to
graphite-base/126
ethanndickson
force-pushed
the
graphite-base/126
branch
from
228d121 to
1fd5855
Compare
ethanndickson
force-pushed
the
ethan/conflicts-desc-and-fs-context-menu
branch
from
c236dba to
51d7a5c
Compare
ethanndickson
force-pushed
the
ethan/conflicts-desc-and-fs-context-menu
branch
from
51d7a5c to
f38aab7
Compare
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.
Last QoL PR for now..
This adds buttons to the alt click context menu:
And it adds a brief description of each conflict to the status tooltip:
There's three cases for now. The first is just a basic file conflict, the second is if there's a type conflict (file, directory, symlink, etc), and the third is self-explanatory.
We'll need to come up with a proper design for how we show conflicts, so this implementation is just to not leave users in the dark if they run into any.