the last commit on feature/tabintegration is fixing null handling in sddoutputgenerator:
32f39ed
this one is also handled by @JonasKunze in this commit (on likebutton branch)
f15162d#diff-3
the commit before on tabintegration was mered to develop on everything from there is in the likebutton branch.
So I would suggest to delete the tabintegration branch and continue working in likebutton branch and develop
the last commit on feature/tabintegration is fixing null handling in sddoutputgenerator:
32f39ed
this one is also handled by @JonasKunze in this commit (on likebutton branch)
f15162d#diff-3
the commit before on tabintegration was mered to develop on everything from there is in the likebutton branch.
So I would suggest to delete the tabintegration branch and continue working in likebutton branch and develop