Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Allow rebasing in git sync

See original GitHub issue

git sync should allow (or be able to default to) rebasing.

Even though the documentation says the that there is an “Auto-merge/rebase” the code seems to point out that it can only merge. Am I missing something?

Issue Analytics

State:
Created 11 years ago
Comments:14

Top GitHub Comments

1reaction

weakishcommented, Jul 20, 2017

I think this has been fixed by #92. And 252b1eb allows “always rebase” for git sync.

0reactions

DouglasLivingstonecommented, Aug 24, 2012

Looking at scm.py#L132, when would this return 0?

len(merges.split('commit'))

Does that cause it to always do a merge?

Top Results From Across the Web

Merging vs. Rebasing | Atlassian Git Tutorial

By default, the git pull command performs a merge, but you can force it to integrate the remote branch with a rebase by...

Configuring commit rebasing for pull requests - GitHub Docs

Under "Pull Requests", select Allow rebase merging. This allows contributors to merge a pull request by rebasing their individual commits onto the base...

git-rebase Documentation - Git

Rebase all commits reachable from <branch> , instead of limiting them with an <upstream> . This allows you to rebase the root commit(s)...

git synchronization of rebased branches - Stack Overflow

I have just experimented with it and using git pull --rebase works when pulling from a rebased branch. Without the --rebase flag, ...

Introduction to Git rebase and force-push - GitLab Docs

git rebase rewrites the commit history. It can be harmful to do it in shared branches. It can cause complex and hard to...