fix(sync_branches): always sync with merge commit#249
Merged
Conversation
github-actions
bot
added
the
t-infra
fnesveda
approved these changes
Feb 27, 2026
Member
fnesveda
left a comment
fnesveda
left a comment
There was a problem hiding this comment.
Cool 👍
BTW why is this happening mainly on worker, but not elsewhere? Because worker releases are so good that they don't need fixes? 😄
Contributor
Author
@fnesveda because apify-main does not directly merge with git. Instead a PR is created with the github API and merged immediately. (I wonder why it's different in the repos, maybe something to unify...) |
lukasmrtvy
added
the
validated
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
(primarily a problem in apify-worker) Sometimes a merge commit isn't created when syncing branches and the mainline gets fast-forwarded from master/main. This "breaks" history as the first parent of the fast-forwarded commit is now the master branch history.
For easily seeing the history with only actual feature commits I use
git log --oneline --first-parent- with fast-forward commits this breaks.The
--no-ffflag ensures that a merge commit is always created if there are commits to be synced from master -> develop.