commit your changes or stash them before you can merge - I didn't change anything :-(

[Siju George]

On Thu, May 20, 2010 at 7:16 PM, Sdävtaker <sdavtaker at gmail.com> wrote:
> if you are sure those changes got no value you can also:
> git reset --hard (that will remove the changes you have)
>

Hi Thanks That was easy :-)

> git reset --hard
Checking out files: 100% (29011/29011), done.
HEAD is now at d575613 scsi(4): Add a missing 'break'.
> git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.