Skip to content

Spork v0.1.0
Compare
Choose a tag to compare
@slarse slarse released this 25 Feb 13:05
· 344 commits to master since this release
v0.1.0
372f8a0

Spork v0.1.0 release notes

The big new features is that Spork can now handle conflicts, making it a fully functioning prototype of a merge tool. That is not to say that it doesn't blow up sometimes (it does!), but it handles all tasks a merge tool should be able to handle. Just not always correctly :)

Features

  • 05fb207 Add support for handling structural conflicts #20
    • See PR #28 for more details on this
  • cec7468 Add rudimentary handling of content conflicts #19
    • See PR #22 for more details on this
  • 7ffc924 Only perform top-down matching for left-right match #23
  • ed25494 Add conservative approach to augmenting class representatives map #23
  • 374b374 Handle merging of import statements, fix #17
  • 1b82d0f Add front end support for non-single-class files, fix #15
  • a2ea0b0 Add back end support for non-single-class files, fix #14
  • 72cdd9f Handle content for the most common code elements #1

Bugfixes

  • 02eebc5 Skip processing PCS that is already conflicting #21
  • 577f31f Augment class representatives more conservatively #23
  • f71f05f Fix bug in getOtherPredecessor causing it to never work
  • 660d44a Also pretty-print package statements, fix #16
  • 72c2ae6 Work around bug in Spoon by reading from virtual file #18
  • 5e69f5a Fix crash caused by mishandling annotations with contents, fix #2
Assets 3
Loading