Conflict resolution tool

[trickeydan]

It would be useful to have a tool that explains merge conflicts in a real-life context: e.g

This item is both here and there. Where should it be?

[PeterJCLaw]

While I can see where the desire for this tool comes from, I'm not sure that the level of effort it would take to make it reliable and easy to use (I estimate that that would be a lot) is worth it.

Despite having used the inventory quite a lot I don't personally recall hitting any merge conflicts myself. That's not to say that I can't imagine a case where they happen, rather than they're fairly rare.

There are a small number of guiding principles to this (worth noting since prevention is better than cure):

• As the inventory is tracking real world items, one should only be moving items that you are actually highly confident of the location of (usually they're directly in your possession)
• Where possible ensure that your copy of the repo is up to date before (and after) making changes; In this regards it's better to think about the inventory as being a non-distributed system
• Prefer rebase over merge as this generally results in either git being able to sort the issue itself (I assume) or more obvious failure modes