Merge-friendly output of command hashes for breeze #24711
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
potiuk
force-pushed
the
merge-friendly-hash-for-breeze-commands
branch
from
6332a65 to
c487084
Compare
We had just one hash generated from all commands in breeze and that basically meant that when there were two PRs on two different commands in Breeze, they resulted with merge conflict which should be solved with `breeze regenerate-command-images`. This change turns the hash output into a multi-command one - i.e. each command has its own hash, which will make it much more merge-friendly - i.e. if two PRs will work on two different commands the rebase should result with merge rather than conflict.
potiuk
force-pushed
the
merge-friendly-hash-for-breeze-commands
branch
from
c487084 to
11911c2
Compare
dstandish
approved these changes
Jun 28, 2022
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Jun 29, 2022
We had just one hash generated from all commands in breeze and that basically meant that when there were two PRs on two different commands in Breeze, they resulted with merge conflict which should be solved with `breeze regenerate-command-images`. This change turns the hash output into a multi-command one - i.e. each command has its own hash, which will make it much more merge-friendly - i.e. if two PRs will work on two different commands the rebase should result with merge rather than conflict. (cherry picked from commit 94f4f81)
ephraimbuddy
added
the
changelog:skip
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.
We had just one hash generated from all commands in breeze and that
basically meant that when there were two PRs on two different
commands in Breeze, they resulted with merge conflict which
should be solved with
breeze regenerate-command-images.This change turns the hash output into a multi-command one - i.e.
each command has its own hash, which will make it much more
merge-friendly - i.e. if two PRs will work on two different commands
the rebase should result with merge rather than conflict.
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragement file, named
{pr_number}.significant.rst, in newsfragments.