API tools faq
paste
Guest User

Untitled

a guest
Oct 11th, 2018
94
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.39 KB | None | 0 0
raw download clone embed print report
  1. armenzg@armenzg-mbp js-perf-dashboard$ git status
  2. rebase in progress; onto b1ccc26
  3. You are currently rebasing branch 'aimenbatool-Add-drilldown-link' on 'b1ccc26'.
  4. (all conflicts fixed: run "git rebase --continue")
  5.  
  6. Changes to be committed:
  7. (use "git reset HEAD <file>..." to unstage)
  8.  
  9. modified: src/components/Graphs/index.jsx
  10. modified: src/views/Benchmark/index.jsx
  11.  
  12. armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
  13. Applying: Issue#69 - Add drilldownl link for benchmark
  14. Applying: Issue#69 - Fix benchmark drilldown link
  15. Using index info to reconstruct a base tree...
  16. M src/views/Benchmark/index.jsx
  17. Falling back to patching base and 3-way merge...
  18. Auto-merging src/views/Benchmark/index.jsx
  19. CONFLICT (content): Merge conflict in src/views/Benchmark/index.jsx
  20. error: Failed to merge in the changes.
  21. Patch failed at 0002 Issue#69 - Fix benchmark drilldown link
  22. The copy of the patch that failed is found in: .git/rebase-apply/patch
  23.  
  24. When you have resolved this problem, run "git rebase --continue".
  25. If you prefer to skip this patch, run "git rebase --skip" instead.
  26. To check out the original branch and stop rebasing, run "git rebase --abort".
  27.  
  28. armenzg@armenzg-mbp js-perf-dashboard$ git diff
  29. diff --cc src/views/Benchmark/index.jsx
  30. index e6bab4a,990201b..0000000
  31. --- a/src/views/Benchmark/index.jsx
  32. +++ b/src/views/Benchmark/index.jsx
  33. @@@ -51,8 -40,9 +51,12 @@@ class Benchmark extends Component
  34. : (
  35. <Graphs
  36. benchmarkData={benchmarkData}
  37. - platform={platform}
  38. overviewMode={benchmark === 'overview'}
  39. ++<<<<<<< HEAD
  40. + platform={this.props.platform}
  41. ++=======
  42. + benchmark={benchmark}
  43. ++>>>>>>> Issue#69 - Fix benchmark drilldown link
  44. />
  45. );
  46. }
  47. armenzg@armenzg-mbp js-perf-dashboard$ vi src/views/Benchmark/index.jsx
  48. armenzg@armenzg-mbp js-perf-dashboard$ git diff
  49. diff --cc src/views/Benchmark/index.jsx
  50. index e6bab4a,990201b..0000000
  51. --- a/src/views/Benchmark/index.jsx
  52. +++ b/src/views/Benchmark/index.jsx
  53. @@@ -51,8 -40,9 +51,9 @@@ class Benchmark extends Component
  54. : (
  55. <Graphs
  56. benchmarkData={benchmarkData}
  57. - platform={platform}
  58. overviewMode={benchmark === 'overview'}
  59. - platform={this.props.platform}
  60. ++ platform={platform}
  61. benchmark: PropTypes.string.isRequired,
  62. + benchmark={benchmark}
  63. />
  64. );
  65. }
  66. armenzg@armenzg-mbp js-perf-dashboard$ git add src/
  67. armenzg@armenzg-mbp js-perf-dashboard$ git status
  68. rebase in progress; onto b1ccc26
  69. You are currently rebasing branch 'aimenbatool-Add-drilldown-link' on 'b1ccc26'.
  70. (all conflicts fixed: run "git rebase --continue")
  71.  
  72. Changes to be committed:
  73. (use "git reset HEAD <file>..." to unstage)
  74.  
  75. new file: package-lock.json
  76. modified: src/components/Graphs/index.jsx
  77. modified: src/views/Benchmark/index.jsx
  78.  
  79. armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
  80. Applying: Issue#69 - Fix benchmark drilldown link
  81. Applying: Issue #69 - Apply overview mode condition to render link
  82. Applying: Issue#69 - Replace anchor tag with Link component and fix drilldown URL
  83. Applying: Issue #69 - Add configUID parameter to the test data
  84. Applying: Issue #69 - Split code in muliple lines and remove package-lock.json
  85. Using index info to reconstruct a base tree...
  86. M src/views/Benchmark/index.jsx
  87. Falling back to patching base and 3-way merge...
  88. Auto-merging src/views/Benchmark/index.jsx
  89. CONFLICT (content): Merge conflict in src/views/Benchmark/index.jsx
  90. Removing package-lock.json
  91. error: Failed to merge in the changes.
  92. Patch failed at 0006 Issue #69 - Split code in muliple lines and remove package-lock.json
  93. The copy of the patch that failed is found in: .git/rebase-apply/patch
  94.  
  95. When you have resolved this problem, run "git rebase --continue".
  96. If you prefer to skip this patch, run "git rebase --skip" instead.
  97. To check out the original branch and stop rebasing, run "git rebase --abort".
  98.  
  99. armenzg@armenzg-mbp js-perf-dashboard$ git diff
  100. diff --cc src/views/Benchmark/index.jsx
  101. index a105056,08a98f2..0000000
  102. --- a/src/views/Benchmark/index.jsx
  103. +++ b/src/views/Benchmark/index.jsx
  104. @@@ -51,9 -40,8 +51,12 @@@ class Benchmark extends Component
  105. : (
  106. <Graphs
  107. benchmarkData={benchmarkData}
  108. - platform={platform}
  109. overviewMode={benchmark === 'overview'}
  110. ++<<<<<<< HEAD
  111. + platform={platform}
  112. + benchmark={benchmark}
  113. ++=======
  114. ++>>>>>>> Issue #69 - Split code in muliple lines and remove package-lock.json
  115. />
  116. );
  117. }
  118. armenzg@armenzg-mbp js-perf-dashboard$ vi src/views/Benchmark/index.jsx
  119. armenzg@armenzg-mbp js-perf-dashboard$ git diff
  120. diff --cc src/views/Benchmark/index.jsx
  121. index a105056,08a98f2..0000000
  122. --- a/src/views/Benchmark/index.jsx
  123. +++ b/src/views/Benchmark/index.jsx
  124. armenzg@armenzg-mbp js-perf-dashboard$ git add src/
  125. armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
  126. Applying: Issue #69 - Split code in muliple lines and remove package-lock.json
  127. armenzg@armenzg-mbp js-perf-dashboard$ git log master... --oneline
  128. 63212ac (HEAD -> aimenbatool-Add-drilldown-link) Issue #69 - Split code in muliple lines and remove package-lock.json
  129. 77f86f0 Issue #69 - Add configUID parameter to the test data
  130. c08e20e Issue#69 - Replace anchor tag with Link component and fix drilldown URL
  131. b591319 Issue #69 - Apply overview mode condition to render link
  132. e2c617f Issue#69 - Fix benchmark drilldown link
  133. e0630dc Issue#69 - Add drilldownl link for benchmark
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!