You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@zookeeper.apache.org by "Kezhu Wang (Jira)" <ji...@apache.org> on 2024/09/28 14:53:00 UTC

[jira] [Updated] (ZOOKEEPER-4806) Commits have to be refreshed after merging

     [ https://issues.apache.org/jira/browse/ZOOKEEPER-4806?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Kezhu Wang updated ZOOKEEPER-4806:
----------------------------------
    Fix Version/s: 3.10.0

> Commits have to be refreshed after merging
> ------------------------------------------
>
>                 Key: ZOOKEEPER-4806
>                 URL: https://issues.apache.org/jira/browse/ZOOKEEPER-4806
>             Project: ZooKeeper
>          Issue Type: Sub-task
>            Reporter: Andor Molnar
>            Assignee: Szucs Villo
>            Priority: Major
>              Labels: pull-request-available
>             Fix For: 3.10.0
>
>          Time Spent: 40m
>  Remaining Estimate: 0h
>
> The following error occurs if somebody wants to cherry-pick immediately after merge:
> {noformat}
> All checks have passed on the github.
> Pull request #2115 merged. Sha: #18c78cd10bc02d764a46ac1659b263cf69f2671d
> Would you like to pick 18c78cd10bc02d764a46ac1659b263cf69f2671d into another branch? (y/n): y
> Enter a branch name [branch-3.9]:
> git fetch apache
> From https://gitbox.apache.org/repos/asf/zookeeper
>    72e3d9ce9..e571dd814  master     -> apache/master
> git checkout -b PR_TOOL_PICK_PR_2115_BRANCH-3.9 apache/branch-3.9
> Switched to a new branch 'PR_TOOL_PICK_PR_2115_BRANCH-3.9'
> git cherry-pick -sx 18c78cd10bc02d764a46ac1659b263cf69f2671d
> fatal: bad object 18c78cd10bc02d764a46ac1659b263cf69f2671d
> Error cherry-picking: Command '['git', 'cherry-pick', '-sx', '18c78cd10bc02d764a46ac1659b263cf69f2671d']' returned non-zero exit status 128.{noformat}
> The reason for this is, because the local git repo doesn't know about the new commit yet.
> We should do a {{git fetch}} after successfully merged via GitHub.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)