All from the command line. Close eyes. Try merge. Pray. :D
I'll have to check out some of the tools mentioned in rest of comments though. I think it is important to know how to do it from the CLI, but if you do know how to do that, I don't mind a tool as well.
I've been working on a feature branch for three weeks now that has around 50 new commits and rebase them every single day with master. So I totally relate with closing eyes and praying part :D
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
All from the command line. Close eyes. Try merge. Pray. :D
I'll have to check out some of the tools mentioned in rest of comments though. I think it is important to know how to do it from the CLI, but if you do know how to do that, I don't mind a tool as well.
I've been working on a feature branch for three weeks now that has around 50 new commits and rebase them every single day with
master. So I totally relate with closing eyes and praying part :D