"git pull" or "git merge" between master and development branches
git, workflow
Solution
Be careful with rebase. If you're sharing your develop branch with anybody, rebase can make a mess of things. Rebase is good only for your own local branches.
Rule of thumb, if you've pushed the branch to origin, don't use rebase. Instead, use merge.
Problem
I have my `master` branch and a `develop` branch for working on a few changes. I need to merge changes from `master` into `develop`, but will eventually merge everything from `develop` into `master`. I have two different workflows in mind: - `git pull origin master` into `develop` branch - `git merge master` into `develop` branch Which is the best way to do this, and why?