qmerge needs to support forced merging
Bug #409865 reported by
Ian Clatworthy
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| QBzr |
Fix Released
|
Wishlist
|
Ian Clatworthy | ||
Bug Description
It should be possible to force a merge using the GUI interface even if there are uncommitted changes in the working tree. A simple solution is to add a 'force merge' checkbox to the existing GUI. Alternatively, the exception could be trapped somehow and a Yes/No style question could be posed to the user.
Related branches
lp:~ian-clatworthy/qbzr/qmerge-options
- Alexander Belchenko: Approve
- Diff: None lines
| Changed in qbzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Confirmed |
| Changed in qbzr: | |
| assignee: | nobody → Ian Clatworthy (ian-clatworthy) |
| milestone: | none → 0.14 |
| status: | Confirmed → Fix Committed |
| Changed in qbzr: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
