Resolve conflicts by silently allowing upstream to win also for HG and GIT