Git weirdness

[magnus.bergmark at gmail.com]

Make sure you haven't staged anything. Does git status really say "clean" before doing the rebase?

On Fri, Oct 9, 2009 at 8:33 PM, Mark Kretschmann <kretschmann at kde.org> wrote:
Whenever I'm doing a "git rebase origin/master" from my local master
branch I'm now getting a conflict in EngineObserver.cpp, although if I
haven't modified the file. So it seems something is wrong in my clone.
Merging works fine though.

What to do? Create a new clone?

-- 
Magnus Bergmark - magnus DOT bergmark AT gmail DOT com
GPG/PGP: 0x7BE84794DB6AA648
Fingerprint: 0E6F D2DB F0EF 534A 2184 52AF 7BE8 4794 DB6A A648
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/amarok-devel/attachments/20091009/9707e428/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: OpenPGP digital signature
Url : http://mail.kde.org/pipermail/amarok-devel/attachments/20091009/9707e428/attachment.sig