Comment by mejutoco

You can always use --theirs or --ours in git. Are you planning to use it with several users or just one? OP did not mention anything about multiple users.