Phabricator workflow ?
Luigi Toscano
luigi.toscano at tiscali.it
Mon Aug 7 23:26:25 UTC 2017
kleag at 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
More information about the kde-games-devel
mailing list