how can i do a git config pull.rebase false?

[Keshav-writes-code]

i had the divergent branches error. i wanted to merge those branches handle conflict. but i can't find a way to pull and merge in lazygit

[stefanhaller]

Lazygit respects your pull.rebase config, so if that's true, it will rebase on pull. You'll have to set it to false outside of lazygit if you don't want that; lazygit doesn't have a UI for that.

My recommendation is always to rebase onto upstream instead of merging upstream in; this results in a cleaner git history and makes the branch easier to review. Do you have a reason why you want to merge instead?

[Keshav-writes-code]

Not, no specific reason to merge. Just heard it online that its good to merge