search

hakaru-CS4ZP6 / hakaru

A probabilistic programming language
BSD 3-Clause "New" or "Revised" License
0 stars 0 forks source link

Merged pull request not showing #48

Closed sohraa3 closed 6 years ago

sohraa3 commented 6 years ago

Pull request #156 Erlang test1, #157 Erlang test2, #158 Erlang test3 were merged into hakaru-dev master but the corresponding changes do not appear. Test and expected files should be in tests/RoundTrip and there should be additions in RoundTrip.hs.

JacquesCarette commented 6 years ago

There were massive conflicts in these PRs as they seemed to all be independent but all changed the same files. I tried to merge as best I could, and clearly did not succeed.

You know much better than I do what the final state should be -- please submit an additional PR that fixes my merge mistakes.