ASSERT-KTH/spork

Issues

• DIfferent bugs resulting in invalid merge outputs found during an experiment

  #533 opened 6 months ago by kjy5
  10

• Try using gumtree-simple matcher in Spork instead of gumtree-classic

  #493 opened a year ago by jrfaller
  6

• Add support for diff3 conflict style

  #496 opened 2 months ago by wetneb
  4

• Absence of conflict in delete/modify case

  #529 opened 6 months ago by wetneb
  2

• Update jgit

  #487 opened 9 months ago by slarse
  1

• Java 21 support

  #479 opened a year ago by wetneb
  3

• Package as a native image to speed up merges

  #480 opened a year ago by wetneb
  1

• Conflicts where left == right

  #225 opened 3 years ago by slarse
  0

• Conflicts on non-syntactical elements

  #224 opened 3 years ago by slarse
  1

• Remove comments on version numbers from GitHub Actions

  #205 opened 4 years ago by slarse
  0

• Feedback about Spork's dependency management

  #184 opened 4 years ago by imjhonny
  3

• Update setup-java in GitHub Actions workflow to v2.0.0

  #181 opened 4 years ago by slarse
  0

• Run file merge benchmark only on master

  #177 opened 4 years ago by slarse
  0

• Add support for macOS

  #172 opened 4 years ago by slarse
  0

• Add support for Windows

  #173 opened 4 years ago by slarse
  0

• Use a single logger for the entire project

  #168 opened 4 years ago by slarse
  0

• Convert to Kotlin

  #155 opened 4 years ago by slarse
  0

• Bad URL in replication/install.sh

  #151 opened 4 years ago by slarse
  0

• replication/install.sh uses curl, but that's not available by default on Ubuntu 18.04

  #152 opened 4 years ago by slarse
  0

• Build benchmarks fail because the jars pointed to no longer exist

  #153 opened 4 years ago by slarse
  0

• Replace benchmarks with a mini-replication of the thesis

  #149 opened 4 years ago by slarse
  0

• Applicability to other languages?

  #148 opened 4 years ago by nikitalita
  6

• Spork's line-based merge reports a conflict if the base revision is the empty string

  #144 opened 4 years ago by slarse
  0

• Conflicts reported on implicit elements

  #143 opened 5 years ago by slarse
  0

• Refactor ContentMerger into a plugin-friendly system

  #142 opened 5 years ago by slarse
  0

• Make conflict resolution "pluggable"

  #139 opened 5 years ago by slarse
  0

• Add an optimistic conflict handler when one side of the conflict is empty

  #140 opened 5 years ago by slarse
  0

• Type members can be duplicated if left and right add non-identical members

  #136 opened 5 years ago by slarse
  0

• Use reprinting for comments

  #137 opened 5 years ago by slarse
  0

• exitOnError does the exact opposite of what it's supposed to do

  #135 opened 5 years ago by slarse
  0

• Spork crashes in two-way merges

  #134 opened 5 years ago by slarse
  0

• Spork's current structural representation in PCS is insufficiently granular

  #132 opened 5 years ago by slarse
  2

• Ignoring implicit elements in the merge may drastically reduce the PCS set size

  #130 opened 5 years ago by slarse
  1

• SourceExtractor.getOriginalSource sometimes passed elements in the wrong order

  #131 opened 5 years ago by slarse
  0

• Sometimes there are multiple packages in the merge

  #129 opened 5 years ago by slarse
  0

• Express move and delete conflicts (roughly)

  #127 opened 5 years ago by slarse
  0

• gumtree-topdown is insufficient for the left-right match

  #124 opened 5 years ago by slarse
  1

• Detecting inconsistencies is still flaky

  #121 opened 5 years ago by slarse
  0

• Spork fails to detect multi declaration/initialization causing duplication of fields and locals

  #123 opened 5 years ago by slarse
  0

• Spork sometimes drops semicolons as a result of reusing expression/statement source code

  #114 opened 5 years ago by slarse
  1

• Spork internal conflict markers sometimes get printed in string literals

  #122 opened 5 years ago by slarse
  0

• Add a fallback to line-based merge if the merge fails

  #120 opened 5 years ago by slarse
  0

• Make spork comply with `git merge-file` by exiting with amount of merge conflicts

  #113 opened 5 years ago by slarse
  0

• Set version number in CLI

  #118 opened 5 years ago by slarse
  0

• Unsetting the source position of certain nodes breaks ordering

  #115 opened 5 years ago by slarse
  0

• Remove Spork's compare command

  #117 opened 5 years ago by slarse
  0

• PcsBuilder fails to add child list of leaf nodes

  #116 opened 5 years ago by slarse
  0

• Use original source to a granularity of expressions and statements

  #112 opened 5 years ago by slarse
  0

• Fields and local variable declarations are sometimes printed twice when using original source

  #111 opened 5 years ago by slarse
  1

• Type members are inserted based on their position

  #110 opened 5 years ago by slarse
  1