git | branch sync – learning notes

Branching is different in git vs svn/cvs. By itself git branching isn’t too complex.

The git local/remote set-up is new to me. By itself, not too complex.

However, in reality we have to manage the combination of branching and sync – a higher level of complexity addressed in many online discussions. I would prefer to rely on the git commands (rather than GUI tools or Stash) to understand and manage it.

I like the philosophy in http://longair.net/blog/2009/04/16/git-fetch-and-merge/

–comparing the local branch vs remote branch

git diff feature/my_br6 origin/feature/my_br6 — path/to/your/file

–to see the mapping between local ^ remote branches

git branch -vv

— FETCH_HEAD:

http://stackoverflow.com/questions/1800783/compare-local-git-branch-with-remote-branch

–check out a remote branch? local branch to track remote branch?

http://makandracards.com/makandra/521-check-out-a-remote-branch-in-git

http://stackoverflow.com/questions/1783405/checkout-remote-git-branch

–delete a branch locally, then remotely:

http://gitready.com/beginner/2009/02/02/push-and-delete-branches.html

Advertisements
Posted in git

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s