merge hooks correctly on update #209
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
fdietze
approved these changes
Jul 24, 2018
LukaJCB
approved these changes
Jul 24, 2018
…writen by an update
cornerman
force-pushed
the
merge-hooks-update
branch
from
4f83c4a
to
05ed69b
Compare
cornerman
added a commit
that referenced
this pull request
Mar 18, 2019
Fix merging hooks in `updateDataObject`, we should not replace them but merge with the ones from the proxy (as with everything else).
cornerman
added a commit
to cornerman/outwatch
that referenced
this pull request
Sep 24, 2021
Fix merging hooks in `updateDataObject`, we should not replace them but merge with the ones from the proxy (as with everything else).
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.
Fix merging hooks in
updateDataObject, we should not replace them but merge with the ones from the proxy (as with everything else).Based on #208