Development is carried out by two developers through a repository on BitBucket .
There are several lines in the file, differing among the developers of #define how to ignore when pull , then merge with the local branch, it is this file but at the same time that these files are tracked locally.
More precisely, when merge automatically speak gita to take a local version. Is always.

  • one
    ru.stackoverflow.com/a/611870/178576 - aleksandr barakin
  • So I realized that there is no ready-made "beautiful" solution. Write a separate program that would change the value of #define on mine? Is there a way in the git system to tag chunks of code with tags that are then taken into account when merge? Or are there other ways to implement it somehow? - Artem Tikhonovich
  • 2
    there is a ready-made solution, it is stated on the link provided. Take local settings into a separate file that you do not include in version control. - aleksandr barakin

0