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

List:       kde-devel
Subject:    Re: Problems updating kde-qt
From:       David Jarvie <djarvie () kde ! org>
Date:       2009-11-23 22:02:58
Message-ID: 200911232202.59274.djarvie () kde ! org
[Download RAW message or body]

On Monday 23 Nov 2009 20:45:56 Thiago Macieira wrote:
> Em Segunda-feira 23. Novembro 2009, ās 19.54.07, David Jarvie escreveu:
> > On Monday 23 Nov 2009 17:56:46 Thiago Macieira wrote:
> > > 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.
> > 
> > 'git reset --hard' output the following message when it completed:
> > 
> > HEAD is now at 6972065 Merge remote branch 'public/4.6-stable' into
> >  4.6-stable-patched
> > 
> > 'git pull' still reports the same error as before.
> 
> From 6972065 to 4.6-stable-patched or master, it's a fast-forward.
> 
> So my guess is that you're not pulling either, but something else. I can't 
> reproduce any problem by pulling master or 4.6-stable-patched from that 
> commit.
> 
> Can you paste the output of: git config -l. And tell us which branch you're on.
 
user.name=David Jarvie
user.email=djarvie@kde.org
color.ui=true
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=git://gitorious.org/+kde-developers/qt/kde-qt.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.4.6-stable-patched.remote=origin
branch.4.6-stable-patched.merge=refs/heads/4.5.2-patched

I'm on branch 4.6-stable-patched (from 'git branch').

-- 
David Jarvie.
KDE developer.
KAlarm author and maintainer.
http://www.astrojar.org.uk/kalarm
 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

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