I never liked rebase, because it alters the history of the branch. I think that better is just hop from current branch to master, pull changes, hop back to branch and git merge master.
git merge master
Well, I use very often rebases to squash dummy comits, that aren't that informative for the project.
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 never liked rebase, because it alters the history of the branch. I think that better is just hop from current branch to master, pull changes, hop back to branch and
git merge master.Well, I use very often rebases to squash dummy comits, that aren't that informative for the project.