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

List:       kde-games-devel
Subject:    Re: Phabricator workflow ?
From:       kleag () free ! fr
Date:       2017-08-14 8:46:36
Message-ID: 450737718.17206934.1502700396230.JavaMail.root () zimbra61-e11 ! priv ! proxad ! net
[Download RAW message or body]

Hi,

----- Mail original -----
> De: "Luigi Toscano" <luigi.toscano@tiscali.it>
> À: "KDE games development" <kde-games-devel@kde.org>
> Envoyé: Mardi 8 Août 2017 01:26:25
> Objet: Re: Phabricator workflow ?
> 
> kleag@free.fr ha scritto:
> > Hi,
> > 
> > I just landed my first phabricator review after it was accepted. It
> > pushed to git one commit with the content of my three local
> > commits.
> 
> I see only one commit:
> https://cgit.kde.org/ksirk.git/log/?h=frameworks
Yes, the "problem" was just on my local repository.
 
> 
> > 
> > After a git pull, it created a merge commit and now, a git  status
> > says:
> > 
> > On branch frameworks
> > Your branch is ahead of 'origin/frameworks' by 3 commits.
> >   (use "git push" to publish your local commits)
> > nothing to commit, working directory clean
> > 
> > It has my  initial commits plus the merge one. So, what should I do
> > ? I was thinking that after the landing my local branch would be
> > aligned with the remote one...
> 
> 
> Just reset your local branch to follow the frameworks branch.
OK. I was thinking that arc would do that itself.

Bye,

Gaël


> 
> Ciao
> --
> Luigi
> 
[prev in list] [next in list] [prev in thread] [next in thread]