git: avoid merge conflicts when adding changelog entries#2273
Merged
Conversation
From https://git-scm.com/docs/git-merge-file > Instead of leaving conflicts in the file, resolve conflicts favouring > our (or their or both) side of the lines. Signed-off-by: JP Simard <jp@jpsim.com>
Augustyniak
approved these changes
May 13, 2022
jpsim
added a commit
that referenced
this pull request
May 17, 2022
* origin/main: (97 commits) docs: update python packages to work with Python 3.10 (#2286) test: adding a cancel test, cleaning up copy-paste code (#2283) envoy: update to d88f31b (#2279) api: disallow setting 'host' header directly (#2275) android: add support for registering a platform KV store (#2134) Bump Lyft Support Rotation (#2278) tools: Enable the VSCode completion db to use bazelisk if available (#2277) Release v0.4.6.20220513-4 Fix android_release_deploy Release v0.4.6.20220513-3 Release v0.4.6.20220513-2 net: enable happy eyeballs by default (#2272) git: avoid merge conflicts when adding changelog entries (#2273) docs: fix sphinx reference mismatch warning (#2274) tests: add -Xcheck:jni to kotlin integration tests by default (#2269) configuration: enable h2 ping by default (#2270) Add version history entries for user-facing changes (#2271) configuration: filter unroutable addresses on Android by default (#2267) Integrate rules_xcodeproj (#2263) Add assert when failing to get_env (#2253) ... Signed-off-by: JP Simard <jp@jpsim.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
From https://git-scm.com/docs/git-merge-file
Also see this blog post: https://about.gitlab.com/blog/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/