How to pull to a local branch from remote origin main

[aidanmatchette]

How can I specify I want to pull from remote origin main into my local dev branch.

[Nauxscript]

I have the same demand; I always in the local dev branch coding and in order to get the new feature my colleague merge I need to pull origin master branch into my local dev branch.

[mark2185]

Is there a specific reason why pulling/fetching master and then rebasing the local dev branch onto it is not an option?

[Nauxscript]

just for pulling origin master code and merge to local dev branch quickly and my leader not recommended to use rebase in case someone not up on git makes a mess

[mark2185]

Alright, so you don't rebase, but you merge when doing that? There's M for merge into currently checked out branch.

In any case, you can always run a custom command with by pressing : and typing in whatever you would normally do on the command line, it'll appear in the suggestions tab next time and you can just press <Tab> to select it.

[Nauxscript]

thank for your answer, maybe : will be useful.

[ooloth]

The way I do this is I...

1. Move to the Branches pane
2. Put my cursor on my local main branch
3. Press f to fetch the latest changes from origin/main
4. Press M to merge the updated local main branch into my checked-out local feature branch (cursor is still on main)

[javierheisecke-consultr]

Comment for future self. M = shift+m

[canton7]

Yes please!

From the branches pane, if you use r you get the option "Rebase on the base branch (origin/main)". It would be awesome to have the mirror option "Merge base branch (origin/main)" if you use M.