Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
208287e6
Commit
208287e6
authored
Jul 18, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reword the failed-to-rebase error message in ee_specific_check script
[ci skip]
parent
0621592b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+6
-8
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
208287e6
...
...
@@ -167,16 +167,14 @@ module EESpecificCheck
say
<<~
MESSAGE
💥 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
💥 automatical way. Please rebase
#{
target_head
}
with CE master.
💥 For more details, please read:
💥 automatic way.
💥
💥
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,
💥 we can only ask the authors to rebase and resolve the conflicts
💥 for this script.
⚠️ Git diff:
💥 For more details, please read:
💥 https://gitlab.com/gitlab-org/gitlab-ee/issues/6038#note_86862115
💥
💥 Git diff:
#{
diff
}
MESSAGE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment