Automatically abort empty merges
Automatically resolve conflicts to upstream's copy