documentation on conflict resolution needs worked examples

[James Hunt]

The documentation for bzr on conflict resolution really should include some non-trivial worked examples:

  http://doc.bazaar.canonical.com/bzr.2.4/en/user-guide/resolving_conflicts.html
  http://doc.bazaar.canonical.com/bzr.2.4/en/user-reference/conflict-types-help.html

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:

  http://paste.ubuntu.com/769005/

[Martin Packman (gz)]

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.