I have some environment specific files in a Git repo.
When I merge my dev branch to master, I don't want to overwrite those files in master with the ones from dev.
How can I set those files to be ignored when merging the branches?
Asked
Active
Viewed 1,040 times
0
-
Don't commit config files. – evolutionxbox Jul 23 '20 at 13:11
-
It needs to be committed because Jenkins needs it. Not config actually, more like specifications. – Arghya Jul 23 '20 at 13:12
-
Does this answer your question? [How to merge specific files from Git branches](https://stackoverflow.com/questions/18115411/how-to-merge-specific-files-from-git-branches) – evolutionxbox Jul 23 '20 at 13:14
-
Not really. It's kind of the opposite of what I want. – Arghya Jul 23 '20 at 13:19
-
The thinking is still the same, however. You first merge (without committing) and throw away only the file changes you don't want. – evolutionxbox Jul 23 '20 at 13:20
-
I tried some of the stuff from the answers like gitattributes and it didn't seem to work for my use case. – Arghya Jul 23 '20 at 13:21
2 Answers
3
Merge and then just check them out:
git merge some_branch --no-commit -m "some merge"
git checkout HEAD -- file1 file2 file3
git merge --continue
You might set GIT_EDITOR to /bin/true if the process is going on in a script:
GIT_EDITOR=/bin/true git merge --continue
-
This workaorund seems to be working. Would have liked to have something like .gitignore for merging but this would work for now. Thanks a ton! – Arghya Jul 23 '20 at 21:44
1
If you push any file to .git and merge the branch to master , it will definitely override the master branch files. No. way to prevent this.
Instead of this, create different config files for different environments and configure Jenkins to use those files.
Chakreshwar Sharma
- 2,571
- 1
- 11
- 35
-
I wish it was that simple for the files to be configured for Jenkins because different repos are running with different configurations. But thanks for suggestion. – Arghya Jul 23 '20 at 13:52