API tools faq
paste
shaifali

rebase failed

shaifali
Oct 30th, 2014
182
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.72 KB | None | 0 0
raw download clone embed print report
  1.  
  2. aaa@ubuntu:/opt/stack/horizon$ git status
  3. On branch review/shaifali_agrawal/bug/1375820
  4. You are currently rebasing branch 'review/shaifali_agrawal/bug/1375820' on '7341055'.
  5. (all conflicts fixed: run "git rebase --continue")
  6.  
  7. nothing to commit, working directory clean
  8. aaa@ubuntu:/opt/stack/horizon$ git rebase --continue
  9. Applying: CSS padding style is used instead of &nsbp;
  10. No changes - did you forget to use 'git add'?
  11. If there is nothing left to stage, chances are that something else
  12. already introduced the same changes; you might want to skip this patch.
  13.  
  14. When you have resolved this problem, run "git rebase --continue".
  15. If you prefer to skip this patch, run "git rebase --skip" instead.
  16. To check out the original branch and stop rebasing, run "git rebase --abort".
  17.  
  18. aaa@ubuntu:/opt/stack/horizon$ git stash apply
  19. Auto-merging openstack_dashboard/static/dashboard/scss/horizon.scss
  20. Auto-merging openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  21. CONFLICT (content): Merge conflict in openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  22. aaa@ubuntu:/opt/stack/horizon$ git diff
  23. diff --cc openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  24. index 714fdc8,b645a2d..0000000
  25. --- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  26. +++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  27. @@@ -77,15 -77,15 +77,27 @@@
  28. <i class="icon-ban-circle"></i>
  29. <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button></center>
  30. {% elif dest.reachable == 'full' %}
  31. ++<<<<<<< Updated upstream
  32. + {% if dest.cidr == row.source.cidr %}
  33. + <center show-submit="false">
  34. + <i class="icon-ok"></i>
  35. + {% else %}
  36. + <center show-submit="true">
  37. + <i class="icon-ok"></i>
  38. + <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button>
  39. + {% endif %}
  40. + </center>
  41. ++=======
  42. + {% if dest.cidr == row.source.cidr %}
  43. + <span show-submit="false">
  44. + <i class="icon-ok"></i>
  45. + {% else %}
  46. + <span show-submit="true">
  47. + <i class="icon-ok"></i>
  48. + <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button>
  49. + {% endif %}
  50. + </span>
  51. ++>>>>>>> Stashed changes
  52. {% else %}
  53. <center><a type="button" class="btn btn-default btn-xs" href="#modal_{{ dest.subnetid|add:row.source.subnetid }}" data
  54. <div class="modal hide" id="modal_{{ dest.subnetid|add:row.source.subnetid }}">
  55. ...skipping...
  56. diff --cc openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  57. index 714fdc8,b645a2d..0000000
  58. --- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  59. +++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  60. @@@ -77,15 -77,15 +77,27 @@@
  61. <i class="icon-ban-circle"></i>
  62. <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button></center>
  63. {% elif dest.reachable == 'full' %}
  64. ++<<<<<<< Updated upstream
  65. + {% if dest.cidr == row.source.cidr %}
  66. + <center show-submit="false">
  67. + <i class="icon-ok"></i>
  68. + {% else %}
  69. + <center show-submit="true">
  70. + <i class="icon-ok"></i>
  71. + <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button>
  72. + {% endif %}
  73. + </center>
  74. ++=======
  75. + {% if dest.cidr == row.source.cidr %}
  76. + <span show-submit="false">
  77. + <i class="icon-ok"></i>
  78. + {% else %}
  79. + <span show-submit="true">
  80. + <i class="icon-ok"></i>
  81. + <button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button>
  82. + {% endif %}
  83. + </span>
  84. ++>>>>>>> Stashed changes
  85. {% else %}
  86. <center><a type="button" class="btn btn-default btn-xs" href="#modal_{{ dest.subnetid|add:row.source.subnetid }}" data
  87. <div class="modal hide" id="modal_{{ dest.subnetid|add:row.source.subnetid }}">
  88. ~
  89. ~
  90. aaa@ubuntu:/opt/stack/horizon$ git status
  91. On branch review/shaifali_agrawal/bug/1375820
  92. You are currently rebasing branch 'review/shaifali_agrawal/bug/1375820' on '7341055'.
  93. (fix conflicts and then run "git rebase --continue")
  94. (use "git rebase --skip" to skip this patch)
  95. (use "git rebase --abort" to check out the original branch)
  96.  
  97. Changes to be committed:
  98. (use "git reset HEAD <file>..." to unstage)
  99.  
  100. modified: openstack_dashboard/static/dashboard/scss/horizon.scss
  101.  
  102. Unmerged paths:
  103. (use "git reset HEAD <file>..." to unstage)
  104. (use "git add <file>..." to mark resolution)
  105.  
  106. both modified: openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
  107.  
  108. Untracked files:
  109. (use "git add <file>..." to include in what will be committed)
  110.  
  111. openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html~
  112. openstack_dashboard/static/dashboard/scss/horizon.scss~
  113.  
  114. aaa@ubuntu:/opt/stack/horizon$ rm openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html~
  115. aaa@ubuntu:/opt/stack/horizon$ rm openstack_dashboard/static/dashboard/scss/horizon.scss~
  116. aaa@ubuntu:/opt/stack/horizon$ git add openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.htmlaaa@ubuntu:/opt/stack/horizon$ git rebase --continue
  117. Applying: CSS padding style is used instead of &nsbp;
  118. error: Ref refs/heads/review/shaifali_agrawal/bug/1375820 is at 673fcb4c0192500b1d4457c1665109273a890cc3 but expected c6a3b46d922068529f9ecf07615fd3e7d61fecfb
  119. fatal: Cannot lock the ref 'refs/heads/review/shaifali_agrawal/bug/1375820'.
  120. Could not move back to refs/heads/review/shaifali_agrawal/bug/1375820
  121. aaa@ubuntu:/opt/stack/horizon$ git status
  122. On branch review/shaifali_agrawal/bug/1375820
  123. You are currently rebasing branch 'review/shaifali_agrawal/bug/1375820' on '7341055'.
  124. (all conflicts fixed: run "git rebase --continue")
  125.  
  126. nothing to commit, working directory clean
  127. aaa@ubuntu:/opt/stack/horizon$
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!