Ash Wilson
Ash Wilson
Yah, I've been thinking about revisiting the conflict-marker UI a little, and this is one of the considerations. Maybe a gear that exposes the menu for "other resolutions"?
Nope, sorry, I haven't had chance to allocate time to this for a while now (day job, you know).
Well, the view that owns the controls is [SideView](https://github.com/smashwilson/merge-conflicts/blob/master/lib/view/side-view.coffee#L7-L13); I've highlighted the markup generation. The resolution commands are defined and implemented in [ConflictedEditor](https://github.com/smashwilson/merge-conflicts/blob/master/lib/conflicted-editor.coffee#L74-L81). That should get you started, I think?
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This issue still applies...
This is likely a duplicate of #171. Is it consistently on the second and later attempts? That's a new one.
That's strange. I can't reproduce this, and looking through the source, I don't see how that method [couldn't be defined](https://github.com/smashwilson/merge-conflicts/blob/master/lib/git-bridge.coffee#L76). Does this happen every time? If so, can you try...
Interesting! I wonder if the installation was corrupted somehow on that machine. I don't suppose you've tried uninstalling and reinstalling it? Other than that, launching it with the dev tools...
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...
Well, that's not good. I suspect that this is related to #68, but we were never able to nail down what the problem was, there. :thought_balloon: I'm trying to think...