Commit 208287e6 authored by Robert Speicher's avatar Robert Speicher

Reword the failed-to-rebase error message in ee_specific_check script

[ci skip]
parent 0621592b
...@@ -167,16 +167,14 @@ module EESpecificCheck ...@@ -167,16 +167,14 @@ module EESpecificCheck
say <<~MESSAGE say <<~MESSAGE
💥 Git status is not clean! This means the CE branch has or had a 💥 Git status is not clean! This means the CE branch has or had a
💥 conflict with CE master, and we cannot resolve this in an 💥 conflict with CE master, and we cannot resolve this in an
💥 automatical way. Please rebase #{target_head} with CE master. 💥 automatic way.
💥 For more details, please read:
💥 💥
💥 https://gitlab.com/gitlab-org/gitlab-ee/issues/6038#note_86862115 💥 Please rebase #{target_head} with CE master.
💥 💥
💥 Before Git could provide a way to resolve conflicts upon rebasing, 💥 For more details, please read:
💥 we can only ask the authors to rebase and resolve the conflicts 💥 https://gitlab.com/gitlab-org/gitlab-ee/issues/6038#note_86862115
💥 for this script. 💥
💥 Git diff:
⚠️ Git diff:
#{diff} #{diff}
MESSAGE MESSAGE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment