Three-way merge?
When updating from upstream, we currently only compare what upstream has and what we locally have. By saving a copy of the last known upstream state, we can compare strings in this way:
- if last upstream and local state have the same value, use new upstream value
- if last upstream and new upstream have the same value, use the local value
- if new upstream and local state have the same value, use the local value
- if all three have different values, ask user for what they want to do