Relative Content

Tag Archive for windowsgitmergegit-mergegitattributes

How can I keep files unchanged using .gitattributes between branches?

I have a struggle with git about a case. I want to keep track of my project on a GitHub repository with two branches main and dev. However, there are two files, and I don’t want to change them when merging between branches because these files keep branch-specific information (e.g. connection string).