The plugin supports resolution via "Keep Both" methods acceptOursThenTheirs() and acceptTheirsThenOurs() 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.
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
:ConflictedEditor
This change is