Page MenuHomePhabricator
Paste P5711

rebase issue (branch T168387_Create_UI_button_for_article_reminder into T168388)
ActivePublic

Authored by Eee888 on Jul 10 2017, 4:10 PM.
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (review/foxy_brown/T168388)
$ git rebase --onto T168387_Create_UI_button_for_article_reminder
First, rewinding head to replay your work on top of it...
Applying: New Article Reminder API
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M Hooks.php
M extension.json
M i18n/api/en.json
M i18n/api/qqq.json
Falling back to patching base and 3-way merge...
Auto-merging includes/api/ApiEchoArticleReminder.php
CONFLICT (add/add): Merge conflict in includes/api/ApiEchoArticleReminder.php
Auto-merging i18n/api/qqq.json
CONFLICT (content): Merge conflict in i18n/api/qqq.json
Auto-merging i18n/api/en.json
CONFLICT (content): Merge conflict in i18n/api/en.json
Auto-merging extension.json
CONFLICT (content): Merge conflict in extension.json
Auto-merging Hooks.php
CONFLICT (content): Merge conflict in Hooks.php
Patch failed at 0001 New Article Reminder API
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (review/foxy_brown/T168388|REBASE 1/3)
$ git rebase --continue
Applying: New Article Reminder API
Applying: Article Reminder UI button
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M Hooks.php
M extension.json
Falling back to patching base and 3-way merge...
Auto-merging modules/styles/mw.echo.ui.ArticleReminderWidget.less
CONFLICT (add/add): Merge conflict in modules/styles/mw.echo.ui.ArticleReminderWidget.less
Auto-merging modules/ext.echo.article-reminder.init.js
CONFLICT (add/add): Merge conflict in modules/ext.echo.article-reminder.init.js
Auto-merging Hooks.php
CONFLICT (content): Merge conflict in Hooks.php
Patch failed at 0002 Article Reminder UI button
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (review/foxy_brown/T168388|REBASE 2/3)
$ git rebase --continue
Applying: Article Reminder UI button
Applying: Create UI for submitting article reminder
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (review/foxy_brown/T168388)
$ git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
5d0acf59 (HEAD -> review/foxy_brown/T168388) Create UI for submitting article reminder
829e810e Article Reminder UI button
699bfefc New Article Reminder API
a02a52e3 (T168387_Create_UI_button_for_article_reminder) Article Reminder UI button
40eacd30 New Article Reminder API
7a9eddd5 new notification type was added and works with feature flag (enables=false)
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Processing changes: refs: 1, done
To ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo.git
! [remote rejected] HEAD -> refs/publish/master/T168388 (same Change-Id in multiple changes.
Squash the commits with the same Change-Id or ensure Change-Ids are unique for each commit)
error: failed to push some refs to 'ssh://eee888@gerrit.wikimedia.org:29418/mediawiki/extensions/Echo.git'

Event Timeline

Eee888 created this paste.Jul 10 2017, 4:10 PM