This is similar to what GitJournal does. It'll never present you with a merge conflict and will instead just make prefer the local changes. It's not perfect, b

This is similar to what GitJournal does. It'll never present you with a merge conflict and will instead just make prefer the local changes. It's not perfect, but in the worst case, the wrong option is chosen, but no data is lost since the history is there in Git.