feat(sync): pull from remote main branch #589
Merged
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.
git sync
should be more controllable #574 by rebasing the local main commits on top of the remote main branch.git reword --force-rewrite
on a public commit moves the remote-tracking branch. #516, since git-branchless no longer knows about remote branches, so it doesn't try to move them.git sync
should be more controllable #574.git sync
will now rebase commits onto the local main branch, and won't rebase the local main branch on top of the remote main branch unless you pass--pull
.That's 5 of the 18 open bugs!