How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init
| @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); | |
| * { | |
| font-size: 12px !important; | |
| font-family: Ubuntu, "Lucida Grande", "Helvetica Neue", Arial, sans-serif !important; | |
| } | |
| /* Remove space before first tab */ | |
| .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox { | |
| -moz-padding-end: 0 !important; | 
How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init
| #!/usr/bin/env python | |
| #-*- coding: utf-8 -*- | |
| """A post-update Git hook to execute `composer install` when composer.json changes | |
| :Author: Cody Halovich | |
| :Company: HootSuite Media Inc. | |
| """ | |
| import subprocess | 
| // Just before switching jobs: | |
| // Add one of these. | |
| // Preferably into the same commit where you do a large merge. | |
| // | |
| // This started as a tweet with a joke of "C++ pro-tip: #define private public", | |
| // and then it quickly escalated into more and more evil suggestions. | |
| // I've tried to capture interesting suggestions here. | |
| // | |
| // Contributors: @r2d2rigo, @joeldevahl, @msinilo, @_Humus_, | |
| // @YuriyODonnell, @rygorous, @cmuratori, @mike_acton, @grumpygiant, |