I'm still the terminal guy. You don't need anything when you got oh-my-zosh right?
But how do resolve conflicts when you rebase?
I usually,
git rebase master
git rebase --continue
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
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.
I'm still the terminal guy. You don't need anything when you got oh-my-zosh right?
But how do resolve conflicts when you rebase?
I usually,
git rebase mastergit rebase --continue