Do the right thing with untracked files and when interactively accepting merges