File tree Expand file tree Collapse file tree 1 file changed +0
-20
lines changed Expand file tree Collapse file tree 1 file changed +0
-20
lines changed Original file line number Diff line number Diff line change @@ -300,26 +300,6 @@ function continueRebasing() {
300300 }
301301 }
302302
303- if ( filesInUpstreamCommit . includes ( 'polyfill/lib/ecmascript.mjs' ) ) {
304- log ( `
305- Changes to the ecmascript.mjs file in the upstream repository are never
306- automatically rebased onto lib/ecmascript.ts, because the files don't
307- share history and git doesn't think they are at all similar.
308-
309- To resolve this conflict you will need to manually inspect and re-apply
310- changes from polyfill/lib/ecmascript.mjs over to lib/ecmascript.ts. Once
311- done, remove the mjs file from the commit using:
312- git rm polyfill/lib/ecmascript.mjs
313- Then stage the TS version of that file using:
314- git add lib/ecmascript.ts
315- At that point, after any other changes are staged too, you can:
316- trt continue
317-
318- Tip: to see the changes the upstream commit introduced, try running
319- \`<this tool> basediff -U40 polyfill/lib/ecmascript.mjs\`.
320- ` ) ;
321- }
322-
323303 // Try and move to the next conflict
324304 gitContinue ( ) ;
325305 const maybeNewConflict = getConflictHash ( ) ;
You can’t perform that action at this time.
0 commit comments