Document shell_command_after to merge diffs #262
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
This is a useful case for Doodba users, where possibly you want to pre-merge a patch done for Odoo v11 into your Odoo v13 deployment, before Odoo approves it. Using just git branches is not much helpful in this case because no git history is shared, so conflicts would arise always. In fact, this might be the best way to apply merges *always*. That's to be investigated. Upstream support for diffs and patches is being tracked in acsone/git-aggregator#34, but in the mean time this option is available today, so it's better to make it more obvious. @Tecnativa TT19951
pedrobaeza
approved these changes
Dec 16, 2019
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.
This is a useful case for Doodba users, where possibly you want to pre-merge a patch done for Odoo v11 into your Odoo v13 deployment, before Odoo approves it.
Using just git branches is not much helpful in this case because no git history is shared, so conflicts would arise always.
In fact, this might be the best way to apply merges always. That's to be investigated.
Upstream support for diffs and patches is being tracked in acsone/git-aggregator#34, but in the mean time this option is available today, so it's better to make it more obvious.
@Tecnativa TT19951