`git add -u` will add all modified files that are already staged. If you merge, then have to fix a bunch of conflicts, you don't have to add each file as you fix it. Just fix everything and use `git add -u`. I've been using git for over 7 years, and I just now learned this. I will now try to not think of all the time I spent adding files one by one after a conflicted merge.