Question

I am a newcomer to GIT and wanted to know how to just get a latest version of the trunk and DISCARD all of my curent changes.

All I seem to get is the notuptodate error. I do not want to save my old changes…

I also get Your branch is behind 'origin/master' by 15 commits, and can be fast-forwarded. How do I fast forward? Again, I don’t care about changes I have made.

Many thanks in advance, as I the current answers on SO seems to assume you wish to keep changes

Example of error (and things that have been tried)

$ git checkout 

$ git pull 

Updating 69edec1..dc3fdfe error: Entry 'src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs' not uptodate. Cannot merge.

$ git checkout -- src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs 

$ git pull 

Updating 69edec1..dc3fdfe error: Entry 'src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs' not uptodate. Cannot merge.

$ git reset --hard

$ git pull 

Updating 69edec1..dc3fdfe error: Entry 'src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs' not uptodate. Cannot merge.

FIXED: I seem to have fixed the issue by using gitk --all and using the GUI to do a hard reset on the lastest change… I would still really like to understand why the commandline wouldn’t do this?

Answer 1

First thing – thanks for the answers from everyone. It does appear to be a bug over user error. Non of the solutions suggested worked apart from gitk –all and then using the GUI to ‘reset master branch here’

Not ideal but it did work.

Thanks