Avoid merge conflicts in NEWS file #913
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
by using the `union` merge strategy. See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
hadley
added a commit
that referenced
this pull request
Feb 25, 2014
Avoid merge conflicts in NEWS file
|
Cool - thanks! |
|
If new items are added to the top of the |
|
Also, please consider using on the command line in favor of the "Merge" button at GitHub; the former will take advantage of the new
|
|
Ok, I'll give that a go next time. |
|
This old issue has been automatically locked. If you believe you have found a related problem, please file a new issue (with reprex) and link to this issue. https://reprex.tidyverse.org/ |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
by using the
unionmerge strategy.This will simplify life for contributors. Unfortunately, GitHub does not seem to support this for browser-based merging, but merges on the command line will not suffer from merge conflicts in
NEWSanymore.See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.