17 Feb
2020
17 Feb
'20
8:57 a.m.
Slávek Banko wrote:
I don't know if you have your git clone updated.
You can try these steps (in kplayer directory):
git checkout master
../../../scripts/switch_all_submodules_to_head_and_clean anonymous
git checkout issue/1/kplayer
git rebase -S master
git status
Hi Slavek,
this solves only kplayer part, but cmake is still @master and when I do
something there it says:
repo-master/tde/1_git/tde/main/applications/kplayer$ git status
On branch issue/1/kplayer
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working
directory)
(commit or discard the untracked or modified content in submodules)
modified: CMakeLists.txt
modified: cmake (untracked content)
repo-master/tde/1_git/tde/main/applications/kplayer$ git submodule status
cmake
8668335711fa13cec276552d75bfbb4285c7edb0 cmake (r14.0.0-60-g8668335)
thank you in advance
regards