[boost] merging the super-project

I recently made a tweak to the .gitignore of the super-project on the develop branch. How do I merge that to master? The two branches have different histories, so a regular git merge balks. And when I checkout master (thinking I'll just cherry-pick), I end up with a slew of local changes (which I haven't made). Befuddled, Eric