How to pull a remote branch into a local one

[dbatten5]

Sure this is a very basic question but for the life of me I can't see a quick way to to do it. What's the best way to pull the master/main branch from the remote to a local one? I've tried the pull from elsewhere option and then selecting master but I get this error

The coroutine failed with this message: ...hare/nvim/lazy/neogit/lua/neogit/popups/pull/actions.lua:17: attempt to concatenate local 'remote' (a nil value)

Maybe I'm missing some setup there. In any case though it's a bit of a drag going through the process of :Neogit followed by p followed by e then finding the master branch in the list. Is there a quicker way or shortcut to doing this?

Note that I have

[pull]
	rebase = true

in my git config

[CKolkey]

Ahh, so I think I just didn't consider this case (pulling from a local branch) because that's the same as merge. Local branches shouldn't be an option on that popup - I'll fix that.

Anyways, to do what you are trying to do, you can do :Neogit merge m or :Neogit m m

[CKolkey]

interesting, yeah, it might be. If there are conflicts then the rebase wouldn't resolve, and when we re-fetch the state of the repo it'll be mid-rebase.

If you do git log with that hash, does it work?

[dbatten5]

Yeah it does work, that hash is on the remote master branch (and my local one now after the rebase)

[CKolkey]

Ok! If you wanna try this branch out and let me know if it works, I'd appreciate it :) #1346

[CKolkey]

You know what, I can reproduce the issue, and will just fix it ;)

[dbatten5]

Awesome, thanks so much, and thanks for all your hard work on this awesome plugin