- Thread starter Nyght_Hex
- Start date
git pull is prob what you want.
Our alternative approach has become git fetch; git reset --hard origin/master as part of our workflow. It blows away local changes, keeps you up to date with master BUT makes sure you don't just pull in new changes on top on current changes and make a mess. We've used it for a while and it basically feels a lot safer in practice. Just be sure to add/commit/stash any work-in-progress first ! –
Our alternative approach has become git fetch; git reset --hard origin/master as part of our workflow. It blows away local changes, keeps you up to date with master BUT makes sure you don't just pull in new changes on top on current changes and make a mess. We've used it for a while and it basically feels a lot safer in practice. Just be sure to add/commit/stash any work-in-progress first ! –
are you using git?
This is a great tutorial
https://www.servuo.com/tutorials/how-to-manage-a-shards-code-with-github-and-the-command-line.15/
This is a great tutorial
https://www.servuo.com/tutorials/how-to-manage-a-shards-code-with-github-and-the-command-line.15/
I would suggest using something like Source Tree or Tortoise GIT. It allows you to do everything using an UI. This way you don't need to remember all the commands and it visualizes all of the branches and pushes. You also have the ability to just selected the desired files instead of having to navigate to each one individually using the command line.