stechico
11/4/2013 - 2:33 PM

Git - do git fetch then rebase instead of git pull.

Git - do git fetch then rebase instead of git pull.

# instead of pull which does fetching and merging it to the current branch (which has diamond effects on commits nodes) you can use this.

# git fetch && git rebase remotename/branchname local_branchname

git fetch && git rebase origin/sprint1 sprint1

#update your local copy of remote repository by using fetch then rebase your localbranch to the remote repository copy (which is origin/sprint1) then checkout the local_branch which is sprint