On Wed, Jan 25, 2017 at 2:51 PM, Hilco Wijbenga <[email protected]> wrote: > On 25 January 2017 at 14:24, Jacob Keller <[email protected]> wrote: >> On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga >> <[email protected]> wrote: >>> How can I force Git to not assume my change to the first line is >>> "redundant"? >>> >> >> My guess is that you probably want a custom merge driver for your file >> types. That's where I would look initially. > > Mmm, that sounds complex. The "my-code.x" is made up so I could keep > my example as simple as possible. In reality, it's Maven's POM files > (pom.xml). > > So there is no setting for any of this? There is no way to switch off > auto merging for certain files?
Not really sure, but a quick google search revealed https://github.com/ralfth/pom-merge-driver Maybe that will help you? Thanks, Jake
