我使用IntelliJ作为IDE,在Mac上使用终端执行Github命令。我做了一个
git rebase -i origin/main
有一些冲突和错误,比如:
error: could not apply 7d4bdfs7...
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
如何在IntelliJ中显示这些冲突,以便手动合并它们?
