[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Problems updating kde-qt
From:       Thiago Macieira <thiago () kde ! org>
Date:       2009-11-23 17:56:46
Message-ID: 200911231856.47274.thiago () kde ! org
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


Em Segunda-feira 23 Novembro 2009, ās 13:59:39, David Jarvie escreveu:
> I did a 'git pull' on kde-qt, and for some unknown reason it complained
>  about merge conflicts in a few files. (AFAIK, I haven't edited any of the
>  files, so why was there a conflict?)
> 
> I tried deleting the files it complained about and then did a 'git pull'
>  again, but it still says "You are in the middle of a conflicted merge."
>  What can I do to fix this and get an up to date checkout?

git reset --hard

This will revert any pending changes (the merge) and discard the conflicted 
status of those files.

PS: kde-qt is a repository, not a branch, so please tell us which branch you 
tried to pull.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358

["signature.asc" (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]