Pull (Rebase) Interrupted Resolve all conflicts before continuing.
Two buttons, Abort and Continue, are visible.
webApps/ webapp
flows / main / pages
main-start-page.html
resources / images
icon.png
Readme.md
All the files are badged with a C icon against a red background, indicating a conflict.