Skip to content

DONT REVIEW: diff tool merge over test #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nsthorat wants to merge 19 commits into from
Closed

DONT REVIEW: diff tool merge over test #1993

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
374e3a0
diff tool merge over
Sep 6, 2019
e95ec90
save
Sep 6, 2019
014e714
save
Sep 6, 2019
bc9f16b
save
Sep 6, 2019
7a8d7bc
save
Sep 6, 2019
8786a39
save
Sep 6, 2019
c8b6dd0
save
Sep 6, 2019
3536366
save
Sep 6, 2019
e19f22d
save
Sep 9, 2019
07e9479
save
Sep 9, 2019
751b37e
save
Sep 9, 2019
4f558fc
save
Sep 9, 2019
88513b1
save
Sep 9, 2019
0c560b2
save
Sep 9, 2019
9fb13d3
save
Sep 9, 2019
4c69f62
save
Sep 9, 2019
0d72e01
save
Sep 9, 2019
8cf5f61
save
Sep 9, 2019
6e9e050
merge branch (#1)
nsthorat Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
save
  • Loading branch information
Nikhil Thorat committed Sep 6, 2019
commit bc9f16bd1c1edc40f524c09cfb32dafc8a2f6396
2 changes: 1 addition & 1 deletion scripts/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ exec(`git clone https://github.com/tensorflow/tfjs ${CLONE_CURRENT_PATH}`);
shell.cd(CLONE_CURRENT_PATH);
exec(`git checkout ${branchName}`);
const mergeBase = exec(`git merge-base master ${branchName}`).stdout.trim();
const res = shell.exec(`git checkout ${commitSha}`, opt);
const res = shell.exec(`git checkout ${commitSha}`);
if (!ignoreCode && res.code !== 0) {
console.log(`${commitSha} does not exist. PR coming from a fork.`)
}
Expand Down