2. laby

warning: skipped previously applied commit 95c785d5
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config set advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging public/resources/scss/modules/_blog.scss
CONFLICT (content): Merge conflict in public/resources/scss/modules/_blog.scss
Auto-merging src/Controller/BlogController.php
Auto-merging templates/blog/article.html.twig
CONFLICT (content): Merge conflict in templates/blog/article.html.twig
Auto-merging templates/blog/list.html.twig
CONFLICT (content): Merge conflict in templates/blog/list.html.twig
error: could not apply 1858eee8... feat(blog): enhance article display with preview images and responsive styles
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 1858eee8... # feat(blog): enhance article display with preview images and responsive styles
 (1)

To 10.42.1.8:client/labymod4neo/labymod.git
 ! [rejected]              develop -> develop (fetch first)
error: failed to push some refs to '10.42.1.8:client/labymod4neo/labymod.git'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 (1)

@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!
Someone could be eavesdropping on you right now (man-in-the-middle attack)!
It is also possible that a host key has just been changed.
The fingerprint for the ED25519 key sent by the remote host is
SHA256:nLJDWG2kTakWalT94kMKv1sC4qCwVRF+V0q4WzuRPoA.
Please contact your system administrator.
Add correct host key in /app/data/ssh/known_hosts to get rid of this message.
Offending ED25519 key in /app/data/ssh/known_hosts:3
  remove with:
  ssh-keygen -f '/app/data/ssh/known_hosts' -R '10.42.1.8'
Host key for 10.42.1.8 has changed and you have requested strict checking.
Host key verification failed.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
 (128)