SHARE
TWEET
Untitled
a guest
Oct 11th, 2018
58
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
- armenzg@armenzg-mbp js-perf-dashboard$ git status
- rebase in progress; onto b1ccc26
- You are currently rebasing branch 'aimenbatool-Add-drilldown-link' on 'b1ccc26'.
- (all conflicts fixed: run "git rebase --continue")
- Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
- modified: src/components/Graphs/index.jsx
- modified: src/views/Benchmark/index.jsx
- armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
- Applying: Issue#69 - Add drilldownl link for benchmark
- Applying: Issue#69 - Fix benchmark drilldown link
- Using index info to reconstruct a base tree...
- M src/views/Benchmark/index.jsx
- Falling back to patching base and 3-way merge...
- Auto-merging src/views/Benchmark/index.jsx
- CONFLICT (content): Merge conflict in src/views/Benchmark/index.jsx
- error: Failed to merge in the changes.
- Patch failed at 0002 Issue#69 - Fix benchmark drilldown link
- 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".
- armenzg@armenzg-mbp js-perf-dashboard$ git diff
- diff --cc src/views/Benchmark/index.jsx
- index e6bab4a,990201b..0000000
- --- a/src/views/Benchmark/index.jsx
- +++ b/src/views/Benchmark/index.jsx
- @@@ -51,8 -40,9 +51,12 @@@ class Benchmark extends Component
- : (
- <Graphs
- benchmarkData={benchmarkData}
- - platform={platform}
- overviewMode={benchmark === 'overview'}
- ++<<<<<<< HEAD
- + platform={this.props.platform}
- ++=======
- + benchmark={benchmark}
- ++>>>>>>> Issue#69 - Fix benchmark drilldown link
- />
- );
- }
- armenzg@armenzg-mbp js-perf-dashboard$ vi src/views/Benchmark/index.jsx
- armenzg@armenzg-mbp js-perf-dashboard$ git diff
- diff --cc src/views/Benchmark/index.jsx
- index e6bab4a,990201b..0000000
- --- a/src/views/Benchmark/index.jsx
- +++ b/src/views/Benchmark/index.jsx
- @@@ -51,8 -40,9 +51,9 @@@ class Benchmark extends Component
- : (
- <Graphs
- benchmarkData={benchmarkData}
- - platform={platform}
- overviewMode={benchmark === 'overview'}
- - platform={this.props.platform}
- ++ platform={platform}
- benchmark: PropTypes.string.isRequired,
- + benchmark={benchmark}
- />
- );
- }
- armenzg@armenzg-mbp js-perf-dashboard$ git add src/
- armenzg@armenzg-mbp js-perf-dashboard$ git status
- rebase in progress; onto b1ccc26
- You are currently rebasing branch 'aimenbatool-Add-drilldown-link' on 'b1ccc26'.
- (all conflicts fixed: run "git rebase --continue")
- Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
- new file: package-lock.json
- modified: src/components/Graphs/index.jsx
- modified: src/views/Benchmark/index.jsx
- armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
- Applying: Issue#69 - Fix benchmark drilldown link
- Applying: Issue #69 - Apply overview mode condition to render link
- Applying: Issue#69 - Replace anchor tag with Link component and fix drilldown URL
- Applying: Issue #69 - Add configUID parameter to the test data
- Applying: Issue #69 - Split code in muliple lines and remove package-lock.json
- Using index info to reconstruct a base tree...
- M src/views/Benchmark/index.jsx
- Falling back to patching base and 3-way merge...
- Auto-merging src/views/Benchmark/index.jsx
- CONFLICT (content): Merge conflict in src/views/Benchmark/index.jsx
- Removing package-lock.json
- error: Failed to merge in the changes.
- Patch failed at 0006 Issue #69 - Split code in muliple lines and remove package-lock.json
- 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".
- armenzg@armenzg-mbp js-perf-dashboard$ git diff
- diff --cc src/views/Benchmark/index.jsx
- index a105056,08a98f2..0000000
- --- a/src/views/Benchmark/index.jsx
- +++ b/src/views/Benchmark/index.jsx
- @@@ -51,9 -40,8 +51,12 @@@ class Benchmark extends Component
- : (
- <Graphs
- benchmarkData={benchmarkData}
- - platform={platform}
- overviewMode={benchmark === 'overview'}
- ++<<<<<<< HEAD
- + platform={platform}
- + benchmark={benchmark}
- ++=======
- ++>>>>>>> Issue #69 - Split code in muliple lines and remove package-lock.json
- />
- );
- }
- armenzg@armenzg-mbp js-perf-dashboard$ vi src/views/Benchmark/index.jsx
- armenzg@armenzg-mbp js-perf-dashboard$ git diff
- diff --cc src/views/Benchmark/index.jsx
- index a105056,08a98f2..0000000
- --- a/src/views/Benchmark/index.jsx
- +++ b/src/views/Benchmark/index.jsx
- armenzg@armenzg-mbp js-perf-dashboard$ git add src/
- armenzg@armenzg-mbp js-perf-dashboard$ git rebase --continue
- Applying: Issue #69 - Split code in muliple lines and remove package-lock.json
- armenzg@armenzg-mbp js-perf-dashboard$ git log master... --oneline
- 63212ac (HEAD -> aimenbatool-Add-drilldown-link) Issue #69 - Split code in muliple lines and remove package-lock.json
- 77f86f0 Issue #69 - Add configUID parameter to the test data
- c08e20e Issue#69 - Replace anchor tag with Link component and fix drilldown URL
- b591319 Issue #69 - Apply overview mode condition to render link
- e2c617f Issue#69 - Fix benchmark drilldown link
- e0630dc Issue#69 - Add drilldownl link for benchmark
RAW Paste Data
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.