Update Conflict Resolution Directions #31
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
During a Lineage merge any changes should be manually resolved to ensure that all relevant changes are being applied. The current directions may lead someone to blindly ignore changes in the Lineage configuration file. Since this file is rarely changed it should always be manually reviewed if it's a file with conflicts.
mcdonnnj
added
the
improvement
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.
🗣 Description
This PR updates the conflict resolution instructions to remove the directions to ignore changes to the Lineage configuration file.
💭 Motivation and context
All Lineage generated changes should be manually reviewed to ensure that desired changes are being made.
🧪 Testing
Automated tests pass.
✅ Checklist