ding ding ding. The original dev should have made a new feature branch off master. Then they should have dropped the 18 files in, or if the 18 files had a com

ding ding ding. The original dev should have made a new feature branch off master. Then they should have dropped the 18 files in, or if the 18 files had a commit history, cherry picked those commits into the new feature branch. The next day, when he was ready for the rest of the changes, merge those into the feature branch. These devs were trying to be clever, and got bit by it :) KISS