Closed (fixed)
Project:
Cloud
Version:
4.x-dev
Component:
Code
Priority:
Normal
Category:
Task
Assigned:
Reporter:
Created:
5 Aug 2021 at 02:54 UTC
Updated:
2 Sep 2021 at 08:29 UTC
Jump to comment: Most recent, Most recent file
| Comment | File | Size | Author |
|---|---|---|---|
| #8 | スクリーンショット 2021-08-06 10.53.29.png | 38.22 KB | Ryo Yamashita |
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
Comments
Comment #3
Ryo Yamashita commentedComment #4
yasComment #5
yasComment #6
Ryo Yamashita commentedComment #7
yas@ryo-yamashita
Thank you for the update. I tried to apply the patch and received the following error. Could you please rebase the patch? Thanks!
Comment #8
Ryo Yamashita commented@yas
Thank you for reporting this error message. In this screenshot, the following message is displayed, and rebase is not available by d.o.
Therefore, when I run the rebase command locally, I see that a conflict occurs.
Is it OK to commit after resolving the conflict and then push it?
Comment #9
yas@ryo-yamasthia
Yes you need to rebase locally: "Fast-forward merge is not possible. To merge this request, first rebase locally." It is simply a git repository so we can use the common
gitcommands.Comment #10
Ryo Yamashita commented@yas
I rebased and pushed the fix commit. Please check this commit.
Comment #13
yas@ryo-yamashita
Thank you for the update. I merged the patch to
4.xand closing this issue as Fixed.Comment #14
yas