Sync all branches with git

I get the code from two main places: my computer at home and my laptop at work. I use Github to store my repositories.

This is the scenario: I did some work on my computer in the storage that I worked on for a while (both on my PC and on my laptop), and ended up with the following branches:

$ git branch
* master
* v123
* test-b

which I pushed to Github. So far so good.

Now I'm on my laptop, and this is what I see before trying to pull something:

$ git branch
* master
* v_123

This is an old version of my repo on my laptop (since I worked on my PC), where the differences are: the branch is missing ( test-b), the other is renamed or is equivalent to deleted and recreated with a new name (i.e. v_123now v123), and in all branches everything has changed.

. / ( Git?; git), .

git sync-branch --all, Github?

+4
2

, , .

git fetch origin
git reset --hard origin/master
git clean -f -d

. .

, --soft --hard.

: , git clean -f -d.

, - .

+4

, , - . .

. Git . . , . , , . Git , , . , , , .

? git pull . . -, ( git fetch). <remote>/<branch> ( -a). .

, , , . . , , git push -u. push-.

EDIT:

, - , ? <remote>/<branch>, , , ?

, Git. , .

git -up -

http://aanandprasad.com/git-up/

, git up, , , . , , .

+3

All Articles