Not really, as I explained at IRC for you he did a small mistake when pushing back his changes to us.
Actually I was in the process of changing my local repositories 'master' branch, when Jim pushed something to the remote repository and I tried to pull his changes. It was a mistake on my part to do 'git pull' which caused this problem.
Debarshi, When you do changes on a branch and want to sync it with a remote one, you shouldn't use git pull. Instead do: git fetch origin/master git rebase origin/master
Ok. Should I revert the commit which caused the problem? Happy hacking, Debarshi -- GPG key ID: 63D4A5A7 Key server: pgp.mit.edu _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
