git-add: no need for -f when resolving a conflict in already tracked path