Git resolve conflict using --ours/--theirs for all files Git resolve conflict using --ours/--theirs for all files git git