As in "git pull", but you've changed a file in the boilerplate code, and have to merge changes.