search

eMoflon / benchmarx

Infrastructure for implementing benchmarx: benchmarks for bidirectional transformation (bx) tools. Also contains a collection of example benchmarx and test runners for various and diverse bx tools.
GNU General Public License v3.0
9 stars 12 forks source link

Fixed three test failures of the NMF solution #57

Closed georghinkel closed 7 years ago

georghinkel commented 7 years ago

Unfortunately, I have no idea how this pull request can be merged given that the previous one was squashed.

anthonyanjorin commented 7 years ago

Couldn't we have avoided these conflicts by you rebasing before issuing the pull request?

georghinkel commented 7 years ago

Unfortunately, github somehow did not let me push my rebased changes. Trying to push it to the fork, I get an error message saying that the tip of the fork is beyond my local repo, which is true because the later changes have been rebased. Perhaps there is a good way of resolving such conflicts, but I wouldn't know.

anthonyanjorin commented 7 years ago

I'm on it - shouldn't be a big problem as I'll just take the latest versions and overwrite what was there before.

georghinkel commented 7 years ago

Otherwise, I just noticed that git push has an option -f to force submit a history change. I guess that's exactly the thing I was missing and with that, I can probably repair the pull request.

anthonyanjorin commented 7 years ago

Please check if master is as you expect it to be. You could also now consider working on a new branch for further changes.