Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove patch warning #8334

Merged
merged 1 commit into from
Nov 13, 2024
Merged

remove patch warning #8334

merged 1 commit into from
Nov 13, 2024

Conversation

enahum
Copy link
Contributor

@enahum enahum commented Nov 13, 2024

Summary

Same as #8332

NONE

@enahum enahum added 2: Dev Review Requires review by a core commiter CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 13, 2024
@enahum enahum added this to the v2.23.0 milestone Nov 13, 2024
@enahum enahum requested a review from rahimrahman November 13, 2024 00:14
@enahum enahum merged commit 8c87ec1 into main Nov 13, 2024
28 checks passed
@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@enahum enahum deleted the network-patch-version branch November 13, 2024 00:21
@mattermost-build
Copy link
Contributor

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
Copy link
Contributor Author

enahum commented Nov 13, 2024

/cherry-pick release-2.23

@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit that referenced this pull request Nov 13, 2024
@enahum @mattermost-build
remove patch warning (#8334)
f771d20 
(cherry picked from commit 8c87ec1)
@mattermost-build mattermost-build mentioned this pull request Nov 13, 2024
Merged
@mattermost-build mattermost-build added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 13, 2024
enahum added a commit that referenced this pull request Nov 13, 2024
@mattermost-build @enahum
remove patch warning (#8334) (#8338)
a408240 
(cherry picked from commit 8c87ec1)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rahimrahman rahimrahman rahimrahman approved these changes

Assignees
No one assigned
Labels
2: Dev Review Requires review by a core commiter CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone release-note-none
Projects
None yet
Milestone
v2.23.0
Development

Successfully merging this pull request may close these issues.
4 participants
@enahum @mattermost-build @rahimrahman @mm-cloud-bot