search

ideaconsult / Toxtree.js

http://ideaconsult.github.io/Toxtree.js/
2 stars 3 forks source link

please merge your branch(es) with master #133

Closed vedina closed 9 years ago

vedina commented 9 years ago

Master is now merged with matrix_rearrangements branch.

However, @gonzomir please merge your branch(es) with master (so that future merges become less complicated) and even better please use fork/pull in future as described here (by @kerberizer )

gonzomir commented 9 years ago

I merged (as in git merge) matrix_rearrangements branch. The only other branch I worked on - final_matrix - doesn't need to be merged, as all it's commits are cherry-picked in master.

What do you mean by "use fork/pull in future"? To fork the project and use pull requests?

vedina commented 9 years ago

Yes, thanks for merging.

Fork/Pull - yes, makes life a bit easier at GitHub. Apologies, seems I have missed the link .

But let's complete Read Across 1.2 this week with the current approach with the branches.