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

List:       kde-games-devel
Subject:    Re: Phabricator workflow ?
From:       Luigi Toscano <luigi.toscano () tiscali ! it>
Date:       2017-08-07 23:26:25
Message-ID: 3fa65511-beed-f823-f55e-a334e86a706b () tiscali ! it
[Download RAW message or body]

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

> 
> 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.

Ciao
-- 
Luigi


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