2015-03-21 1:50 GMT+03:00 Luigi Toscano <luigi.tosc...@tiscali.it>:
> That's not a merge commit: it even says "Squashed commit of the following:",
> so all the commits have been merged together and applied on top of master, if
> I see the history correctly. The frameworks branch is still there, independent
> from master.
> You can track it locally as usual with:
> git checkout -t remotes/origin/frameworks

Luigi, Ben,

Thanks for the clarification on merging as a squashed commit.

I'm pretty sure there's no frameworks branch anymore because:
 1. The "git checkout" command you suggested doesn't work for me, Git says
"Did you intend to checkout 'remotes/origin/frameworks' which can not
be resolved as commit?", even after I did all the "git remote update"
/ "git fetch".
 2. It's missing from the output of "git branch -a".
 3. The KWordQuiz project page [1] shows no "frameworks" branch in the
combo box.

Ben, can you please clarify how to fetch those backups? I don't see
any relevant branches by running "git branch -a".

[1] https://projects.kde.org/projects/kde/kdeedu/kwordquiz/repository

-- 
Alexander Potashev

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

Reply via email to