Preserve comments on merge. #212
Open
Conversation
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
| @EliAndrewC or @robdennis, any chance you'd have the time to review? |
| Can you recreate this PR, I get errors from GitHub trying to leave comments: Failed to create comment: No head repository for pull request with id: 581198892 It looks like there are some unrelated changes in requirements.txt. Please also add some tests. |
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.
This fixes #171. If we're merging config2 into config1, then values from config2, if present, should override values from config1. The same thing needs to happen with comments, but currently it does not.
Related to dbcli/pgcli#1240.
I have an error running
invoke checkand could not resolve it by googling, would appreciate advice on that:https://gist.github.com/j-bennet/392e90ed75873a69b465e32dd6763476