Add option to resolve to either THIS or OTHER
Bug #257297 reported by
Martin Pilkington
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Low
|
Unassigned | ||
Bug Description
It would be nice to be able to have conflicts resolved to a certain version by adding a --this or --other option when doing bzr resolve. This would be useful for when you are moving between computers and IDE project files get updated with various items such as screen size (eg Xcode files). To be able to completely override these to either what I had or what was on my other machine would save me having to go in and remove/rename several files every time I switch machines.
| Changed in bzr: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
Revision history for this message
| James Westby (james-w) wrote | #1 |
Revision history for this message
| Vincent Ladeuil (vila) wrote | #2 |
| tags: | added: check-for-breezy |
| Changed in bzr: | |
| status: | Confirmed → Fix Released |
| tags: | removed: check-for-breezy |
To post a comment you must log in.
Hi,
I think this is coming from the same desire as bug 232512? If so, we should
merge them and come up with a solution that works for all.
Thanks,
James