After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 602873 - [Feature request] Button/key shortcut to move to the next conflict
[Feature request] Button/key shortcut to move to the next conflict
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: general
1.3.x
Other Linux
: Normal enhancement
: ---
Assigned To: Kai Willadsen
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2009-11-24 21:21 UTC by Sami Wagiaalla
Modified: 2010-09-30 21:44 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Add next and previous conflict buttons (6.73 KB, patch)
2010-09-09 15:40 UTC, Tom Hughes 		none Details | Review
Patch (6.84 KB, patch)
2010-09-23 20:19 UTC, Kai Willadsen 		none Details | Review

Description Sami Wagiaalla 2009-11-24 21:21:14 UTC 
I use meld in combination with git-mergetool to merge branches and resolve conflicts.

I would be nice if there was a button and a key board shortcut to move the the next conflict after I fix one. I would also be cool if meld does not let you exit until you have resolved all conflicts.

Thanks
  Sami
Comment 1 Kai Willadsen 2009-11-25 22:41:57 UTC 
Sounds reasonable, though not as easy as one might like. I'll see if I can add support for this under the cursor-position patch.
Comment 2 Tom Hughes 2010-09-09 15:40:05 UTC 
Created attachment 169869 [details] [review]
Add next and previous conflict buttons
Comment 3 Sami Wagiaalla 2010-09-14 21:05:56 UTC 
I gave this a quick try and it works for me.
If we could have slightly different icons for the new buttons
that would be great.

Thanks for the work!
Comment 4 Kai Willadsen 2010-09-23 20:19:39 UTC 
Created attachment 170961 [details] [review]
Patch

Thanks for the patch. Unfortunately, this is one of those situations where I knew it should be done in a particular way, and just hadn't gotten around to it.

The patch I'm attaching should have the same functionality as your version, but it operates in the same way as the rest of our cursor-related functionality and has a couple of minor advantages (notably, that we because we maintain a list of conflicts in Differ, we can do things like display the conflict count, and show which conflict we're in, etc.).

Testing would be appreciated.
Comment 5 Kai Willadsen 2010-09-30 21:44:26 UTC 
I've pushed the above patch to HEAD, so I'm closing this. If you find any problems, please don't hesitate to file a new bug.