GIT is stuck on an old branch, how can I move to the latest one?

[MikleBas]

Hi all!
I ask for help to switch to the current branch of the program, now I'm stuck on version 2.4.11 and 2.6 has already been released
A few months ago I entered the following commands into the console

git reset --hard 26d726a
git commit -m
git commit -m "Revert to 26d726a"
git reset --soft "HEAD@{1}"
git commit -m "Revert to 26d726a"
git pull

But when I entered them, I understood that I recorded on my server any attempts to move further from this thread
How can I now return the system to its current state?
Thanks in advance if anyone responds!

[magicbug]

git switch master

[magicbug]

You could also try git pull --no-ff

[MikleBas]

Error again

git pull --rebase origin master
error: Retrieve with move failed: You have unindexed changes.
error: commit or hide them.

And further

git pull --no-ff
Auto merge system/libraries/Session/Session_driver.php
CONFLICT (content): Merge conflict in system/libraries/Session/Session_driver.php
Auto merge src/QSLManager/QSO.php
Removing docker/docker-compose.yml
Removing docker/Dockerfile
Auto merge assets/json/satellite_data.json
CONFLICT (content): Merge conflict in assets/json/satellite_data.json
Removing assets/js/tempusdominus-bootstrap-4.min.js
CONFLICT (change/removal): assets/js/sections/sattimers.js removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from assets/js/sections/sattimers.js is left in the tree.
Auto merge assets/js/sections/qso.js
CONFLICT (content): Merge conflict in assets/js/sections/qso.js
Auto merge assets/js/sections/logbookadvanced.js
CONFLICT (content): Merge conflict in assets/js/sections/logbookadvanced.js
Auto merge assets/js/sections/gridmap.js
CONFLICT (content): Merge conflict in assets/js/sections/gridmap.js
Auto merge assets/js/sections/contesting.js
Auto merge assets/js/sections/common.js
Auto merge assets/js/sections/bandmap_list.js
Removing assets/js/popper.min.js.map
Removing assets/js/popper.min.js
Removing assets/js/jquery.jclock.js
CONFLICT (change/removal): assets/css/sattimers.css removed in HEAD and changed in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from assets/css/sattimers.css is left in the tree.
Auto merge assets/css/general.css
CONFLICT (content): Merge conflict in assets/css/general.css
Removing assets/css/default/bootstrap.min.css.map
Removing assets/css/default/bootstrap.css.map
Removing assets/css/default/bootstrap.css
Removing assets/css/datepicker.css
Auto merge application/views/view_log/qso.php
Auto merge application/views/user/edit.php
CONFLICT (content): Merge conflict in application/views/user/edit.php
CONFLICT (change/removal): application/views/sattimers/index.php removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from application/views/sattimers/index.php is left in the tree.
Auto merge application/views/qso/index.php
Auto merge application/views/qso/components/previous_contacts.php
CONFLICT (content): Merge conflict in application/views/qso/components/previous_contacts.php
CONFLICT (change/removal): application/views/logbookadvanced/useroptions.php removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from application/views/logbookadvanced/useroptions.php left in the tree.
Auto merge application/views/logbookadvanced/index.php
CONFLICT (content): Merge conflict in application/views/logbookadvanced/index.php
Auto merge application/views/interface_assets/header.php
CONFLICT (content): Merge conflict in application/views/interface_assets/header.php
Auto merge application/views/interface_assets/footer.php
CONFLICT (content): Merge conflict in application/views/interface_assets/footer.php
CONFLICT (change/removal): application/views/hamsat/index.php removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from application/views/hamsat/index.php is left in the tree.
Removing application/views/gridsquares/main.php
Removing application/views/gridsquares/index.php
Auto merge application/views/gridmap/index.php
CONFLICT (content): Merge conflict in application/views/gridmap/index.php
Auto merge application/views/eqsl/import.php
CONFLICT (content): Merge conflict in application/views/eqsl/import.php
Auto merge application/views/dashboard/index.php
CONFLICT (content): Merge conflict in application/views/dashboard/index.php
Auto merge application/views/csv/data/export.php
CONFLICT (change/removal): application/views/components/hamsat/table.php removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from application/views/components/hamsat/table.php is left in the tree.
Auto merge application/views/adif/import.php
CONFLICT (content): Merge conflict in application/views/adif/import.php
Removing application/views/activated_grids/main.php
Removing application/views/activated_grids/index.php
CONFLICT (change/removal): application/views/activated_gridmap/index.php removed in HEAD and modified in 97d1a92d117dfa14226fabd40261984293fa6c24. Version 97d1a92d117dfa14226fabd40261984293fa6c24 from application/views/activated_gridmap/index.php is left in the tree.
Auto merge application/models/Stations.php
CONFLICT (content): Merge conflict in application/models/Stations.php
Auto merge application/models/Logbook_model.php
CONFLICT (content): Merge conflict in ap

[MikleBas]

After entering the commands, the site completely crashed with error 500 :((

[HB9HIL]

Just a random question. Do you have a Proper Backup?

Also a Backup of the Database?

[MikleBas]

I saved the magazine in ADIF format
But unfortunately there is no database
How would that help?
Do you propose to install systems completely from scratch and from scratch?