On Sunday 16 of February 2020 22:30:57 deloptes wrote:
> Sl�vek Banko wrote:
> > git rebase -S master
>
> doesn't help much
>
> #repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S
> master Current branch issue/1/kplayer is up to date.
> #repo-master/tde/1_git/tde/main/applications/kplayer$ git branch
> * issue/1/kplayer
> master
> #repo-master/tde/1_git/tde/main/applications/kplayer$ git checkout
> master M cmake
> Switched to branch 'master'
> Your branch is up to date with 'origin/master'.
> #repo-master/tde/1_git/tde/main/applications/kplayer$ git rebase -S
> master Current branch master is up to date.
> #repo-master/tde/1_git/tde/main/applications/kplayer$
>
> again this
> https://system@.../scm/git/tde-common-cmake
>
> #repo-master/tde/1_git/tde/main/applications/kplayer$
> cat ../../../.git/modules/main/applications/kplayer/config
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> worktree = ../../../../../main/applications/kplayer
> [remote "origin"]
> url = https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [submodule "admin"]
> url =
> https://system@.../scm/git/tde-common-admin
> [submodule "cmake"]
> url =
> https://system@.../scm/git/tde-common-cmake
>
> thanks in advance
>
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
Cheers
--
Sl�vek
Attachments: