upstream-merged-conflicts

There were merge conflicts while merging a new upstream version.

Codebase Campaign Stage Start Time Duration Description
httprint fresh-releases codemod 2023-01-21T22:42 1m25s Merging upstream version 301 resulted in conflicts.
uhd-images fresh-snapshots codemod 2023-01-21T23:59 1h50m Merging upstream version 4.3.0.0+git20221116.1.dfccfce resulted in conflicts.
tftpd32 fresh-snapshots codemod 2023-01-22T01:08 58m15s Merging upstream version 4.50+git20190228.1.ed5b812 resulted in conflicts.
uhd-images fresh-releases codemod 2023-01-22T00:03 2h5m Merging upstream version 4.3.0.0-rc2 resulted in conflicts.
sliver fresh-releases codemod 2023-01-22T02:39 16m12s Merging upstream version 1.5.33 resulted in conflicts.
sherlock fresh-releases codemod 2023-01-22T02:56 1m51s Merging upstream version 0.14.2+git20221228 resulted in conflicts.
sherlock fresh-snapshots codemod 2023-01-22T02:54 4m10s Merging upstream version 0.14.2+git20221228 resulted in conflicts.
sliver fresh-snapshots codemod 2023-01-22T02:38 25m28s Merging upstream version 1.5.33+git20230120.1.19c2533 resulted in conflicts.
quark-engine fresh-releases codemod 2023-01-22T04:20 2m10s Merging upstream version 22.12.1 resulted in conflicts.
quark-engine fresh-snapshots codemod 2023-01-22T04:20 4m28s Merging upstream version 21.4.3 resulted in conflicts.
python-rtlsdr fresh-releases codemod 2023-01-22T04:38 1m35s Merging upstream version 0.2.93 resulted in conflicts.
python-filedepot fresh-releases codemod 2023-01-22T05:21 1m59s Merging upstream version 0.9.0 resulted in conflicts.
pymavlink fresh-snapshots codemod 2023-01-22T06:24 3m4s Merging upstream version 2.4.37+git20230105.1.6b1e0c7 resulted in conflicts.
pacu fresh-releases codemod 2023-01-22T08:11 2m19s Merging upstream version 1.1.1 resulted in conflicts.
mongo-tools fresh-snapshots codemod 2023-01-22T09:57 4m52s Merging upstream version 100.6.1+git20221103.1.9b52310+ds1 resulted in conflicts.
golang-go.dedis-kyber fresh-releases codemod 2023-01-22T15:05 1m56s Merging upstream version 4.0.0~pre2 resulted in conflicts.
golang-go.dedis-kyber fresh-snapshots codemod 2023-01-22T15:05 2m15s Merging upstream version 3.1.0 resulted in conflicts.
golang-go.dedis-fixbuf fresh-snapshots codemod 2023-01-22T15:08 2m1s Merging upstream version 1.0.3+git20191127.1.6f51ba7 resulted in conflicts.
golang-github-projectdiscovery-gologger fresh-releases codemod 2023-01-22T15:10 1m59s Merging upstream version 1.1.7 resulted in conflicts.
golang-github-projectdiscovery-gologger fresh-snapshots codemod 2023-01-22T15:10 2m33s Merging upstream version 1.1.7 resulted in conflicts.
golang-github-ne0nd0g-ja3transport fresh-snapshots codemod 2023-01-22T15:14 2m8s Merging upstream version 0.0~git20221104.8a138af resulted in conflicts.
golang-github-domainr-whoistest fresh-snapshots codemod 2023-01-22T15:42 2m29s Merging upstream version 0.0~git20230116.7af7b8b resulted in conflicts.
golang-github-domainr-whois fresh-snapshots codemod 2023-01-22T15:46 2m26s Merging upstream version 0.1.0+git20230116.1.ffa538d resulted in conflicts.
getallurls fresh-snapshots codemod 2023-01-22T16:24 1m59s Merging upstream version 2.1.2 resulted in conflicts.
fudgec2 fresh-releases codemod 2023-01-22T16:26 2m1s Merging upstream version 1.0 resulted in conflicts.
getallurls fresh-releases codemod 2023-01-22T16:24 1m44s Merging upstream version 2.1.2 resulted in conflicts.
crowbar fresh-snapshots codemod 2023-01-23T00:12 2m18s Merging upstream version 4.2+git20200713.1.4b563dc resulted in conflicts.
dbeaver fresh-snapshots codemod 2023-01-22T23:31 50m49s Merging upstream version 22.3.3+git20230120.1.a8afcb8 resulted in conflicts.
code-oss fresh-releases codemod 2023-01-23T00:33 23m8s Merging upstream version 1.74.3 resulted in conflicts.
cloudscraper fresh-snapshots codemod 2023-01-23T01:01 2m40s Merging upstream version 1.2.68 resulted in conflicts.
cloudscraper fresh-releases codemod 2023-01-23T01:04 1m50s Merging upstream version 1.2.68 resulted in conflicts.
bettercap-ui fresh-snapshots codemod 2023-01-23T15:04 7m55s Merging upstream version 1.3.0+really1.3.0+git20210314.1.93cf252 resulted in conflicts.
aiosmb fresh-snapshots codemod 2023-01-23T17:16 2m32s Merging upstream version 0.4.4+git20221228.1.c7b272f resulted in conflicts.
aiosmb fresh-releases codemod 2023-01-23T17:19 1m44s Merging upstream version 0.4.4 resulted in conflicts.
juice-shop fresh-snapshots codemod 2023-01-22T12:10 1d11h Merging upstream version 14.4.0 resulted in conflicts.
bloodhound fresh-snapshots codemod 2023-01-23T04:06 22h50m Merging upstream version 4.2.0+git20221109.1.96e9996 resulted in conflicts.