itvexesme · December 23, 2023 07:51
diff --git a/file .gitattributes b/file .gitattributes
 # /project/.gitattributes

 .gitlab-ci.yml merge=ours
diff --git a/file gitlab.rb b/file gitlab.rb
 # /etc/gitlab/gitlab.rb

 gitaly['configuration'] = {
  # ...
  git: {
    # ...
    config: [
      # ...
      { key: "merge.ours.driver", value: "true" },
    ],
  },
 }
diff --git a/Gitlab auto-merge .gitlab-ci.yml b/Gitlab auto-merge .gitlab-ci.yml
 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
diff --git a/local git setup b/local git setup
	# /etc/gitlab/gitlab.rb

	gitaly['configuration'] = {
	# ...
	git: {
	# ...
	config: [
	# ...
	{ key: "merge.ours.driver", value: "true" },
	],
	},
	}
	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