Solved #174 and #214

[SamoylovMD]

Now we can write tests according to junit 4 annotations syntax. Another feature is new equals(object, precision) method in Vector and Matrix which allows us to replace MockMatrix and MockVector classes safely.

[vkostyukov]

Maxim @SamoylovMD, this is huge! I appreciate your hard work on a project. Let me carefully review it this evening (in 8-10 hours).

[SamoylovMD]

Sorry, my git gone wild.

[SamoylovMD]

Finally, I won those troubles with version conflict.

[vkostyukov]

43 commits? Omg!

[sylvia43]

Oh did I make this have merge conflicts :P

I only changed fields to final. It might be easier to merge this first then I'll redo what I did. Or we can manually merge this in (that's probably a better idea). I can help out with that.

[vkostyukov]

I would prefer somehow to clear this PR. I mean, it should not be 43 duplicated commits.

[sylvia43]

The best solution there would be to squash all these commits. I'm guessing @SamoylovMD can do it, but I can help if necessary. Otherwise I can check this out, merge it with master, then @SamoylovMD can checkout my merged branch and update this PR.

(I actually really want to merge this. Call me crazy but I like merging/rebasing big things)

[vkostyukov]

Yeah. It's big. I'm not against its size: it's totally fine. I'm agains running the git log history.

[SamoylovMD]

Oh crap. So, to clearify situation: what exactly do I need to do to merge upstream/master branch with my origin/master? And how to merge thousands of commits to one? Just say actions, I'm totally lost.

[DWiechert]

Here's a nice blog post on how to update your fork with the changes that have been merged into the main repo's master - http://joshbranchaud.com/blog/2014/01/17/Updating-Forked-Git-Repository-With-Latest-Upstream-Changes.html

[vkostyukov]

@SamoylovMD, you better have some sleep btw :) // looking at your commit log timestamps.

The only way I see is to create a separate branch, which is equal to current master and cherry-pick there all the needed commits from this PR.

[vkostyukov]

I can try to merge it using command line to avoid duplicates. @SamoylovMD you can live it as is for now.

[SamoylovMD]

Ok, I'll just wait.

[sylvia43]

I'll squash then manually merge it, then you can grab my copy. I'll get it done tonight.

[vkostyukov]

@anubiann00b, then you can just make a PR with @SamoylovMD' commits. This should work.

[sylvia43]

Ok. I'll get on it tonight. This will be fun!

[sylvia43]

Wait this will be a mess to squash... There are commits before and after the PR's I made. I'll just squash the contiguous blocks and the manually fix things in between.

[SamoylovMD]

@DWiechert thx for the link!

[vkostyukov]

This is merged (thanks @anubiann00b!), so we can close this one.