I think it'd be better to add this when (after) you will be doing a squash pull. Otherwise you'd be merging this file with other changes. This file is guaranteed to change by other commits every time. Although most likely this conflict will be handled automatically by git.