我分叉了一个 github 存储库并在我的 github 存储库上工作。
我已经提出了拉取请求并且已经完成。
之后上游又有了一些提交，所以现在我想重新设置基准，我想这就是我必须做的。
但我遇到了这些合并冲突：
First, rewinding head to replay your work on top of it...
Applying: Issue 135 homepage refresh
Using index info to reconstruct a base tree...
<stdin>:17: trailing whitespace.
%h4
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging app/views/layouts/application.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml
Auto-merging app/views/home/index.html.haml
CONFLICT (content): Merge conflict in app/views/home/index.html.haml
Auto-merging app/views/home/_group_projects.html.haml
CONFLICT (content): Merge conflict in app/views/home/_group_projects.html.haml
Failed to merge in the changes.
Patch failed at 0001 Issue 135 homepage refresh
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
我不知道如何解决这些问题，请帮忙。
变基确实是一件令人头疼的事情。您必须解决合并冲突并继续变基。例如，您可以使用合并工具（根据您的设置而有所不同）
git mergetool
然后添加您的更改并继续
git rebase --continue
祝你好运
本文内容由网友自发贡献，版权归原作者所有，本站不承担相应法律责任。如您发现有涉嫌抄袭侵权的内容，请联系:hwhale#tublm.com(使用前将#替换为@)
