3 ms·i don't understand what you mean by "merge"?by ice109 9y agoi don't understand what you mean by "merge"?captainmuon 9y agoAs in "git pull", but you've changed a file in the boilerplate code, and have to merge changes.