From 044fac12200ed105ac2a33419f663d92101a1fd7 Mon Sep 17 00:00:00 2001 From: Asaf Korem Date: Sun, 22 Sep 2024 11:34:59 +0300 Subject: [PATCH] another attempt --- detox/test/e2e/utils/snapshot.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/detox/test/e2e/utils/snapshot.js b/detox/test/e2e/utils/snapshot.js index 3ed8a32016..3d167cf754 100644 --- a/detox/test/e2e/utils/snapshot.js +++ b/detox/test/e2e/utils/snapshot.js @@ -65,7 +65,8 @@ async function expectViewHierarchySnapshotToMatch(viewHierarchy, snapshotName) { async function expectSnapshotToMatch(value, snapshotName, _ignoreWhiteSpace = true) { const snapshotPath = `./e2e/assets/${snapshotName}.${rnMinorVer}.${device.getPlatform()}.txt`; - await execSync(`git checkout -b snapshot-${snapshotName} || git checkout snapshot-${snapshotName} && git rebase master`); + await execSync('git fetch origin'); + await execSync(`git checkout -b snapshot-${snapshotName} || git checkout snapshot-${snapshotName}`); await fs.writeFile(snapshotPath, value, 'utf8');