-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Revert "fix: improve docker set up" #3923
Conversation
This reverts commit 6c359c3.
This reverts commit 05b1495.
This reverts commit ac31212.
This reverts commit 5377e53.
This reverts commit 9987fd4.
This reverts commit ba9196e.
This reverts commit d9f4fab.
This reverts commit 9d222e5.
This reverts commit ef6f0a8.
This reverts commit 0d85446.
This reverts commit 3e263ba.
This reverts commit d1020ba.
This reverts commit e65bd77.
This reverts commit 9a7a23b.
This reverts commit 889f959.
This reverts commit 80c92d4.
This reverts commit 79a834d.
This reverts commit 9378b07.
This reverts commit b2f202c.
This reverts commit 8a50bbb.
This reverts commit 12926f4.
This reverts commit dc1a584.
This reverts commit 9d4f6d7.
This reverts commit 583e1eb.
This reverts commit 19ce7f1.
This reverts commit 12b08de.
@aeneasr might I suggest you take a different merge strategy in future for PRs? You appear to be using the default merge commit which interleaves a PR branches individual commits into the target branch history. Not only does it bring all the individual commits into the target branch, if the branch is long-lived it'll interleave the commits with those from other PRs merged based on timestamps of the individual commits. Without interactive rebase to clean-up commit history this tends to be even worse to navigate. Merging this revert for example: I doubt those In projects I maintain my personal preference is a squash merge commit. I leave commit history in the PR that is reviewed, it is very rare that the change warrants tailoring multiple pristine commits for the master branch, so this bundles the merge into a single logical commit with a reference to the PR. Actually the revert commit history seems to lack a merge commit reference, instead the follow-up PR that brought back the changes with the shared revert commits in it's branch history was merged with the PR ref 🤔 Anyway... just thought it might be worth mentioning as squash merge commits IMO make more sense for merging PRs, far easier to track the scope of changes and related discussions properly via |
That was an accident because we activated merge queues recently. I reverted the commits, and squash merged the appropriate commit. |
Reverts #3921