First, rewinding head to replay your work on top of it...
Applying: maven jar-loader: Initalise files, add archive format.
Using index info to reconstruct a base tree...
M	swh/core/tarball.py
Falling back to patching base and 3-way merge...
Auto-merging swh/core/tarball.py
CONFLICT (content): Merge conflict in swh/core/tarball.py
Patch failed at 0001 maven jar-loader: Initalise files, add archive format.

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto cc26836d61...

Already up to date.

Changes applied before test

commit 5c81a6c2040cc9b294879fbcd189f9f34c850e65
Merge: 5533383 cc26836
Author: Boris Baldassari <boris@chrysalice.org>
Date:   Mon Aug 30 10:20:12 2021 +0200

    maven jar-loader: add archive format for jars.

commit 55333836138fd848158107ce1aa062e7ff83158b
Author: Boris Baldassari <boris@chrysalice.org>
Date:   Mon Aug 30 09:11:04 2021 +0200

    maven jar-loader: Initalise files, add archive format.

See https://jenkins.softwareheritage.org/job/DCORE/job/tests-on-diff/239/ for more details.

Harbormaster completed remote builds in B23254: Diff 22298.Aug 30 2021, 10:23 AM

borisbaldassari requested review of this revision.Aug 30 2021, 10:23 AM

vlorentz accepted this revision.Aug 30 2021, 10:23 AM

This revision is now accepted and ready to land.Aug 30 2021, 10:23 AM

Closed by commit rDCORE55333836138f: maven jar-loader: Initalise files, add archive format. (authored by borisbaldassari). · Explain WhyAug 30 2021, 10:28 AM

This revision was automatically updated to reflect the committed changes.

borisbaldassari added a commit: rDCORE55333836138f: maven jar-loader: Initalise files, add archive format..

borisbaldassari added a commit: rDCORE5c81a6c2040c: maven jar-loader: add archive format for jars..