Skip to content

修复某些场景下,造成遮罩层宽度不适配手机屏幕问题。#32

Open
cavanlee wants to merge 1 commit into
GanZhiXiong:masterfrom
cavanlee:master
Open

修复某些场景下,造成遮罩层宽度不适配手机屏幕问题。#32
cavanlee wants to merge 1 commit into
GanZhiXiong:masterfrom
cavanlee:master

Conversation

@cavanlee

Copy link
Copy Markdown

No description provided.

@GanZhiXiong

GanZhiXiong commented Apr 7, 2021

Copy link
Copy Markdown
Owner

感谢你为代码做的贡献!👍
但是我通过GitHub提供的命令行进行解决冲突了,合并到master后push到GitHub,然后刷新该页,还是提示This branch has conflicts that must be resolved
下面是GitHub提供的解决冲突的命令:

Step 1: From your project repository, check out a new branch and test the changes.
git checkout -b cavanlee-master master
curl -L https://github.com/GanZhiXiong/gzx_dropdown_menu/pull/32.patch | git am -3

Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff cavanlee-master
git push origin master

我不知道该怎么解决了,
我感觉是你的pr方式不对导致的吧,因为处理其他pr没有遇到过需要执行curl -L https://github.com/GanZhiXiong/gzx_dropdown_menu/pull/32.patch | git am -3这条命令。

如果你知道怎么解决?
如果不知道,我将关闭这个pr了,反正我已经把你的代码合并到master了。
再次感谢你的贡献!😀

@GanZhiXiong

Copy link
Copy Markdown
Owner

git status提示下面这个,不知你是否清楚?

$ git status
On branch master
Your branch is up to date with 'origin/master'.

You are in the middle of an am session.
  (fix conflicts and then run "git am --continue")
  (use "git am --skip" to skip this patch)
  (use "git am --abort" to restore the original branch)

nothing to commit, working tree clean

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants