[feat] Implement fallback for move and delete conflicts

[slarse]

Implements a local fallback for move and delete conflicts by performing a line-based merge on the parent whose child list can't be recovered.

Fix #127

[codecov-commenter]

Codecov Report

Merging #128 into master will increase coverage by 0.90%.
The diff coverage is 81.94%.

@@             Coverage Diff              @@
##             master     #128      +/-   ##
============================================
+ Coverage     79.31%   80.22%   +0.90%     
- Complexity      433      443      +10     
============================================
  Files            36       36              
  Lines          1576     1623      +47     
  Branches        242      243       +1     
============================================
+ Hits           1250     1302      +52     
  Misses          208      208              
+ Partials        118      113       -5     

Impacted Files	Coverage Δ	Complexity Δ
...h/spork/spoon/pcsinterpreter/SpoonTreeBuilder.java	87.40% <0.00%> (+2.36%)	41.00 <1.00> (+1.00)
...va/se/kth/spork/spoon/printer/SourceExtractor.java	88.73% <ø> (+2.81%)	29.00 <0.00> (+1.00)
...h/spork/spoon/pcsinterpreter/SporkTreeBuilder.java	82.20% <75.00%> (-4.32%)	30.00 <3.00> (+3.00)	⬇️
...in/java/se/kth/spork/spoon/StructuralConflict.java	85.29% <90.00%> (+1.29%)	16.00 <1.00> (+1.00)
...kth/spork/spoon/pcsinterpreter/PcsInterpreter.java	85.71% <100.00%> (ø)	1.00 <1.00> (ø)
...se/kth/spork/spoon/printer/SporkPrettyPrinter.java	88.32% <100.00%> (+4.98%)	23.00 <2.00> (+2.00)
...rc/main/java/se/kth/spork/util/LineBasedMerge.java	82.05% <100.00%> (+4.90%)	7.00 <1.00> (+1.00)
... and 3 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1eaaa9f...ad94ef9. Read the comment docs.