-
Notifications
You must be signed in to change notification settings - Fork 15
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
Confusion about remote vs local #26
Comments
This is how rebases work. The You can change your default layout to refer to "local" instead of "remote", and prefer revision to prefer "remote": " In 'vimrc', set your default layout.
let g:mergetool_layout = 'ml'
let g:mergetool_prefer_revision = 'remote' to get the behavior for rebasing to match what normally happens for merging. A while back I thought about trying to auto-detect rebase vs merge and set the appropriate thing in those cases, but I got lazy... |
Hi,
Thanks for the amazing tool.
I am a touch confused about how branches are labeled. Here is the following scenario
I have noticed that if I run
git rebase her_stuff
instead ofgit merge her_stuff
, the former marks the windows very differently. For exampleremote
window ends up having my stuff whereas local showsher_stuff
.What is the optimal setup in this scenario? Or is this not the right tool for rebase type workflow?
The text was updated successfully, but these errors were encountered: