provide a hook for post_resolved

Bug #646809 reported by Glen Mailer
This bug affects 1 person
Affects Status Importance Assigned to Milestone

Bug Description

I quite often forget to commit after a merge, and then some more changes get bundled in with my merge. In the usual case these changes are conflict resolutions. I'm looking for a way to remind me that I should commit.

It would be nice to provide a post_resolved hook (or something along those lines), which fires after a conflict-free merge, and after resolving when there are no further conflicts.

The actual warning I'm after is of course plugin territory.

Revision history for this message
Martin Pool (mbp) wrote :

Yes a "no more unresolved conflicts remain" hook would be useful, as would a post-merge hook that tells you whether there are conflicts or not.

Aside from this I think an option to automatically commit after a conflict-free merge could be useful.

tags: added: conflicts easy hooks
Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.