qmerge needs to support --uncommitted merging
Bug #400062 reported by
Ian Clatworthy
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| QBzr |
Fix Released
|
Wishlist
|
Ian Clatworthy | ||
Bug Description
The qmerge dialog needs a checkbox to allow the user to specify "Merge uncommitted changes instead of committed ones". In other words, "bzr merge --uncommitted" is a useful feature I want qmerge to support. I often make small changes directly in the trunk branch. If a change turns out not to be small after all, I then create a new feature branch and merge my work so far across into it.
Also, it may be worth adding support for "bzr merge --force" via another checkbox at the same time.
Related branches
lp:~ian-clatworthy/qbzr/qmerge-options
- Alexander Belchenko: Approve
- Diff: None lines
| Changed in qbzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Confirmed |
Revision history for this message
| Alexander Belchenko (bialix) wrote | #1 |
| 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.
or maybe it could be the part of qcherrypicking?