search

ASSERT-KTH / spork

AST-based structured merge tool for Java, fully Git compatible https://doi.org/10.1109/TSE.2022.3143766
MIT License
51 stars 8 forks source link

Update jgit #487

Closed slarse closed 6 months ago

slarse commented 9 months ago

Later versions of jgit break certain test cases in Spork, conflict resolution in particular.

jgit is currently ignored by Dependabot (see https://github.com/ASSERT-KTH/spork/pull/485#issuecomment-1915482176), so when this is resolved a @dependabot unignore command must be issued for jgit.

wetneb commented 6 months ago

I might have a go at this since it's blocking for #496.