search

mattermost / mattermost-mobile

Next generation iOS and Android apps for Mattermost in React Native
https://about.mattermost.com/
Apache License 2.0
2.26k stars 1.37k forks source link

remove patch warning #8334

Closed enahum closed 1 week ago

enahum commented 1 week ago

Summary

Same as #8332 

NONE
mattermost-build commented 1 week ago

Cherry pick is scheduled.

mattermost-build commented 1 week ago

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/mattermost-mobile
   ea2cb45a1..8c87ec1fc  main         -> upstream/main
   268bb807e..d9e3bc9b6  release-2.23 -> upstream/release-2.23
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-mobile-#8334-upstream-release-2.23-1731457318
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#8334-upstream-release-2.23-1731457318'
Branch 'automated-cherry-pick-of-mattermost-mobile-#8334-upstream-release-2.23-1731457318' set up to track remote branch 'release-2.23' from 'upstream'.

+++ About to attempt cherry pick of PR #8334 with merge commit 8c87ec1fc3dd0637f861410554ba85a1dd13295d.

CONFLICT (rename/rename): patches/@mattermost+react-native-network-client+1.7.2.patch renamed to patches/@mattermost+react-native-network-client+1.6.0.patch in HEAD and to patches/@mattermost+react-native-network-client+1.7.3.patch in 8c87ec1fc (remove patch warning (#8334)).
error: could not apply 8c87ec1fc... remove patch warning (#8334)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UA patches/@mattermost+react-native-network-client+1.7.3.patch
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.
enahum commented 1 week ago

/cherry-pick release-2.23

mattermost-build commented 1 week ago

Cherry pick is scheduled.