This repository has been archived by the owner on Nov 8, 2017. It is now read-only.
[WIP] Add UI element for alternate resolution strategies like "Keep Both" #200
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
|
FYI, this is just a TODO in the code so I don't forget about it. Care to assign to me, @smashwilson? |
But just a dummy interface for the moment... I need access to the `ConflictedEditor` instance to invoke `accept*` methods, which I _think_ is `@editor` (from `CoveringView#initialize`). Need some tests!
I'm not 100% certain about the way forward here, and I haven't tried building locally yet. The `editor` property of `SideView` is _either_ an instance of Atom's `editor` _or_ the `ConflictedEditor` instance I want it to be.
al-the-x
changed the title
|
@smashwilson See notes on my recent commits. Some insight would be helpful, if you have the bandwidth. |
|
any news? |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The plugin supports resolution via "Keep Both" methods
acceptOursThenTheirs()andacceptTheirsThenOurs()but those options are "hidden" underneath the contextual menu (well, I certainly never thought to right-click on the conflict). Provide a UI element -- like a gear button? -- that will supply other resolution options.SideView:ConflictedEditorThis change is