Completed
Push — master ( f1f5ae...d6cfaa )
by Freek
01:26
created

Changes

2 issues (2 major) were introduced.
3 new patches (Unused Use Statements, Doc Comments) are available.
4 added classes/operations
Arrow B MergeConflictSolutionProvider::canSolve() added
Arrow A MergeConflictSolutionProvider added
Arrow A MergeConflictSolutionProvider::getSolutions() added
Arrow A MergeConflictSolutionProvider::getCurrentBranch() added
9.92
▼   -0.02
Head
Freek Van der Herten  
Merge pull request #58 from parallax/feature/merge-conflict
15 more commits
Base
freek  
improve variable name