I have a CENTRAL bare repository that has three developer repositories pulling and pushing to it normally.
I also have two other repositories that pull from the CENTRAL bare repo: one is the live server, and the other is a test/stage server—each pulling from its own respective branch.
The scenario is this: I have a
Really the ideal way to do this is to not use
pull at all, but instead
git fetch origin master git reset --hard FETCH_HEAD git clean -df
master to whatever branch you want to be following.)
pull is designed around merging changes together in some way, whereas
reset is designed around simply making your local copy match a specific commit.
You may want to consider slightly different options to
clean depending on your system's needs.