This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This gist will helps you to get rid of .gitlab-ci.yml conflicts during merges between branches with different ci config files. | |
# local git setup | |
user@localhost: git config --global merge.ours.driver true | |
# repo setup - see .gitattributes | |
# gitlab setup - see .gitlab.rb |