Front End Engineering, May 2015

To merge without creating conflicts in a certain directory

For example, to avoid creating conflicts in dist/, replace <directory-to-ignore-changes-in> with dist

git checkout <branch-to-change>
git merge --no-commit --no-ff <branch-to-merge>
git reset -- <directory-to-ignore-changes-in>
git commit

Testing a merge

• The Savepoint Pattern