Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: add conflict descriptions and file sync context menu#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

ethanndickson
Copy link
Member

@ethanndicksonethanndickson commentedMar 28, 2025
edited
Loading

Last QoL PR for now..

This adds buttons to the alt click context menu:
Screenshot 2025-03-28 at 3 25 12 pm

And it adds a brief description of each conflict to the status tooltip:
image

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.

matifali reacted with heart emoji
@ethanndicksonethanndickson marked this pull request as ready for reviewMarch 28, 2025 04:27
@ethanndicksonethanndickson self-assigned thisMar 28, 2025
@ethanndicksonethanndickson changed the base branch fromethan/fss-restarts tographite-base/126April 2, 2025 03:16
@ethanndicksonethanndicksonforce-pushed theethan/conflicts-desc-and-fs-context-menu branch fromc236dba to51d7a5cCompareApril 2, 2025 03:18
@graphite-appgraphite-appbot changed the base branch fromgraphite-base/126 tomainApril 2, 2025 03:19
@ethanndicksonethanndicksonforce-pushed theethan/conflicts-desc-and-fs-context-menu branch from51d7a5c tof38aab7CompareApril 2, 2025 03:19
@ethanndicksonGraphite App
Copy link
MemberAuthor

ethanndickson commentedApr 2, 2025
edited
Loading

Merge activity

  • Apr 2, 2:52 AM EDT: A user started a stack merge that includes this pull request viaGraphite.
  • Apr 2, 2:52 AM EDT: A user merged this pull request withGraphite.

@ethanndicksonethanndickson merged commitfe20801 intomainApr 2, 2025
4 checks passed
@ethanndicksonethanndickson deleted the ethan/conflicts-desc-and-fs-context-menu branchApril 2, 2025 06:52
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@deansheatherdeansheatherdeansheather approved these changes

@ThomasK33ThomasK33Awaiting requested review from ThomasK33

Assignees

@ethanndicksonethanndickson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2 participants
@ethanndickson@deansheather

[8]ページ先頭

©2009-2025 Movatter.jp