Use union merge for readme and CSS #23
Merged
Conversation
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
There are two lists-like sections in the readme: - Highlights - Related When there are multiple pull requests adding to the lists whichever is merged first would cause conflicts in the rest. The union merge cause Git to try to resolve the conflicts automatically by keeping both additions. Read more here: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ I think this is also useful for the CSS file where it would be common separate rules to be added to the bottom in different pull requests.
|
👍 Too bad this will only work for manual merge and not through the GitHub UI... |
sindresorhus
added a commit
that referenced
this pull request
Feb 18, 2016
Use union merge for readme and CSS
|
I've only recently learned about this use of |
This was referenced Sep 21, 2020
This was referenced Mar 23, 2021
This was referenced May 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There are two lists-like sections in the readme:
When there are multiple pull requests adding to the lists whichever is merged first would cause conflicts in the rest.
The union merge cause Git to try to resolve the conflicts automatically by keeping both additions.
Read more here: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
I think this is also useful for the CSS file where it would be common separate rules to be added to the bottom in different pull requests.