Add tip on solving merge conflicts in functional tests #2261
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
itsyme
approved these changes
Apr 3, 2023
There was a problem hiding this comment.
Good work @yucheng11122017! LGTM besides the small nit! Useful tip that I think many future developers will find useful!
| 3. Checkout to PR branch | ||
| 4. Merge local master into PR branch | ||
| - `git merge master` | ||
| 5. Accept any change to conflicts in generated test files |
There was a problem hiding this comment.
Perhaps we could include examples of files/filetypes of generated functional test files!
There was a problem hiding this comment.
Hi @itsyme, thanks for the comment! I added a tooltip explaining the location of these expected files above (expected for functional and __snapshot__ for unit test)
lhw-1
reviewed
Apr 3, 2023
|
Thanks for the review @lhw-1! Fixed the nits and responded to your comments :) |
lhw-1
reviewed
Apr 3, 2023
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.
What is the purpose of this pull request?
Overview of changes:
Add tip on solving merge conflict in functional test expected results
Tip based on comment by @tlylt
Anything you'd like to highlight/discuss:
Testing instructions:
Proposed commit message: (wrap lines at 72 characters)
Add tip on solving merge conflicts in functional tests
Checklist: ☑️