documentation on conflict resolution needs worked examples
Bug #903755 reported by
James Hunt
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Bug Description
The documentation for bzr on conflict resolution really should include some non-trivial worked examples:
http://
http://
Ideally, with blow-by-blow explanations of:
- exactly what has happened to your branch/working tree
- what the options are to resolve the issue(s)
- what the implications of each option are
As it stands, the non-guru bzr user is going to struggle when "bzr merge-upstream" reports issues such as:
Revision history for this message
| Martin Packman (gz) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: check-for-breezy |
To post a comment you must log in.
That is pretty intimidating status output. There are directions we could point people in to make things better too:
NEWS/Changelog - see changelog_merge plugin or debian specific tools in bzr-builddeb
po/pot - see new in 2.5 po_merge plugin
Text conflicts in *.c etc - basic guide on this front would be nice, it's the common case
Conflicts with scripts directory move is so messy it probably deserves its own bug.