[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 22:20:34
Message-ID: 200911232320.34999.thiago () kde ! org
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


Em Segunda-feira 23. Novembro 2009, ās 23.02.58, David Jarvie escreveu:
> branch.4.6-stable-patched.merge=refs/heads/4.5.2-patched
> 
> I'm on branch 4.6-stable-patched (from 'git branch').

Your 4.6-stable-patched branch is configured to track 4.5.2-patched. So when 
you pull, you're trying to merge the 4.5.2 patches. That's why they're 
conflicting.

git config branch.4.6-stable-patched.merge refs/heads/4.6-stable-patched

that will fix the problem.
-- 
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]