Home/ Questions/Q 8471291
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-10T16:45:24+00:00

I am using git to track a large LaTeX document which I write using

  • 0

I am using git to track a large LaTeX document which I write using Kile on different machines.

Kile writes to its .kilepr config file when closing Kile. The problem I often run into is that I commit before closing Kile. So I commit and push, work on the other machine, and when I come back and want to pull I get a merge conflict because the .kilepr file contains the cursor position (which obviously changed now).

My question: Is there a way to add a merge rule to git config for a specific file (always use –theirs)? Using .gitignore is not an option since the .kilepr file contains important information such as files in the project.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    All possible ways to simulate a merge -s theirs are listed in “git command for making one branch like another“.

    But for one file, all you need is a merge driver, declared in a .gitattributes file, with a keepTheir script like:

    mv -f $3 $2
exit 0

    See ““git merge -s theirs” needed — but I know it doesn’t exist” for a concrete example of a custom merge driver (including my own version).

    • 0