Recently Sublime merge does not show the submodule changes correctly. It either does not show the change, or it displays a change that is not real. It loooks like it is stuck in a particular previous commit for that submodule.
I tried removing all config from sublime merge
I reinstalled the application
When I go to a commit before the change Merge is stuck, everything goes back to normal.
When I go to the terminal, and use git CLI, git does not display any changes.
Debug Information
=== App Version Information ===
Build: 2096
=== Git Version Information ===
Using Git: git (system)
git version 2.45.2
PATH: /home/john/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
=== Browse Page Information ===
HEAD: fccf23a0438da494555f10815d8dff0fcf77e0fc
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0
=== Our Config Information ===
Git Config Path Information
Using config path: /usr/etc/gitconfig
Using config path: /home/fguimaraes/.config/git/config
Using config path: /home/fguimaraes/.gitconfig
Using config path: /home/fguimaraes/projects/mwneo/mwappsdk/.git/config
Our config output is identical to the Git config output
NOTE: I changed some of the values that had personal information
=== Git Attributes Information ===
git check_attr --all output
mwsdk
=== Our Modified Files Newline Normalisation and EOL Information ===
mwsdk: unspecified - native
=== Our Modified Files Flag Information ===
Ignoring symlinks: 0
mwsdk: Working - Gitlink : Index - Gitlink
Screenshots
Here, 06051b38881a7e616a9b1b0f28f06026315e4b3d is the correct commit of the submodule. d336ff22572649a3ea229484c28a169fc3ff42b1 is the commit sublime merge is "stuck".
Version info
Description
Recently Sublime merge does not show the submodule changes correctly. It either does not show the change, or it displays a change that is not real. It loooks like it is stuck in a particular previous commit for that submodule. I tried removing all config from sublime merge I reinstalled the application When I go to a commit before the change Merge is stuck, everything goes back to normal. When I go to the terminal, and use git CLI, git does not display any changes.
Debug Information === App Version Information === Build: 2096
=== Git Version Information === Using Git: git (system) git version 2.45.2 PATH: /home/john/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
=== Browse Page Information === HEAD: fccf23a0438da494555f10815d8dff0fcf77e0fc Is in merge: 0 Is in cherry_pick: 0 Is in rebase: 0 Is in revert: 0
=== Git Status Information ===
=== Our Status Information === M mwsdk
=== Git Config Information === branch.hotfix/client/sprint_8.merge=refs/heads/hotfix/client/sprint_8 branch.hotfix/client/sprint_8.remote=origin branch.main.merge=refs/heads/main branch.main.remote=origin branch.release/client/mwcentral.merge=refs/heads/release/client/mwcentral branch.release/client/mwcentral.remote=origin branch.release/client/sprint_8.merge=refs/heads/release/client/sprint_8 branch.release/client/sprint_8.remote=origin branch.release/client/sprint_9.merge=refs/heads/release/client/sprint_9 branch.release/client/sprint_9.remote=origin core.autocrlf=false core.bare=false core.filemode=true core.logallrefupdates=true core.repositoryformatversion=0 diff.colormoved=zebra fetch.prune=true filter.lfs.clean=git-lfs clean -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true filter.lfs.smudge=git-lfs smudge -- %f merge.ff=false pull.rebase=true remote.origin.fetch=+refs/heads/:refs/remotes/origin/ remote.origin.url=
submodule.mwsdk.active=true
submodule.mwsdk.url=
user.email=
user.name=Francisco Guimaraes
=== Our Config Information === Git Config Path Information Using config path: /usr/etc/gitconfig Using config path: /home/fguimaraes/.config/git/config Using config path: /home/fguimaraes/.gitconfig Using config path: /home/fguimaraes/projects/mwneo/mwappsdk/.git/config
Our config output is identical to the Git config output
NOTE: I changed some of the values that had personal information
=== Git Attributes Information === git check_attr --all output mwsdk
=== Our Modified Files Newline Normalisation and EOL Information === mwsdk: unspecified - native
=== Our Modified Files Flag Information === Ignoring symlinks: 0 mwsdk: Working - Gitlink : Index - Gitlink
Screenshots
Here, 06051b38881a7e616a9b1b0f28f06026315e4b3d is the correct commit of the submodule. d336ff22572649a3ea229484c28a169fc3ff42b1 is the commit sublime merge is "stuck".