I cloned something from git repository, and switched branch
git clone ssh://11.21.3.12:23211/dir1/dir2 dir
git branch branch1
I did some modification in my local, and committed it. And somebody else also done clone and he pushed it in git repository.
Now I want the clone copy of branch1 in my local, (means don't want my update, but his update)
This question is related to
git
Your modifications are in a different branch than the original branch, which simplifies stuff because you get updates in one branch, and your work is in another branch.
Assuming the original branch is named master, which the case in 99% of git repos, you have to fetch the state of origin, and merge origin/master updates into your local master:
git fetch origin
git checkout master
git merge origin/master
To switch to your branch, just do
git checkout branch1
Although git pull origin yourbranch works, it's not really a good idea
You can alternatively do the following:
git fetch origin
git merge origin/yourbranch
The first line fetches all the branches from origin, but doesn't merge with your branches. This simply completes your copy of the repository.
The second line merges your current branch with that of yourbranch that you fetched from origin (which is one of your remotes).
This is assuming origin points to the repository at address ssh://11.21.3.12:23211/dir1/dir2
If you have forked a repository fro Delete your forked copy and fork it again from master.
use git pull:
git pull origin yourbranch
Source: Stackoverflow.com