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

Feedback :) #26

Open
Open
@bew

Description

This plugin is golden ❤️
It's kept simple and does the job very well 👍

Then I was reading git config options, I saw mergetool.hideResolved (added somewhere in 2021):

During a merge Git will automatically resolve as many conflicts as possible and write the MERGED file containing conflict markers around any conflicts that it cannot
resolve; LOCAL and REMOTE normally represent the versions of the file from before Git's conflict resolution. This flag causes LOCAL and REMOTE to be overwriten so that only
the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the mergetool..hideResolved configuration variable. Defaults to false.

Which basically implements what you did with this plugin. Thought you'd want to know 🤷‍♂️

The plugin still helps with the UI setup, where we can easily access local, base & remote with the ...WithHistory variant

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions

        AltStyle によって変換されたページ (->オリジナル) /