d620fd0add atom function script test fix import warningsAgentM10 years ago 668a16bWIP all tests passAgentM10 years ago 7c18077fix transaction graph merge test resolves #30AgentM10 years ago c981accMove OverloadedStrings from language pragmas to cabal fileDiogo Biazus10 years ago b38932dreplace UUID usage with more information TransactionId name wherever possible resolves #22AgentM10 years ago 0f030d0all tests pass againAgentM10 years ago dfb89efunion prefer branch merge testAgentM10 years ago ec4f199merge conflict validation working for union mergeAgentM10 years ago 33a9c17add more subgraph function validationAgentM10 years ago c1dd302more merge tests passingAgentM10 years ago 9c10de5WIP merge tests finally passAgentM10 years ago 4160718WIP compilation checkpoint- union mergeAgentM10 years ago 2e8ae78WIP test more merge strategiesAgentM10 years ago b6ba986finish off selected branch merge testAgentM10 years ago ac5c32fadd union merge implementationAgentM10 years ago 30b6188fix head deletion- this should have never been implemented even after a head is merged, it can continue to be used, duhAgentM10 years ago dcb8584compilation checkpoint- merge tests passingAgentM10 years ago 1044f86WIP fix critical bug in adding child transactions which did not update the parent transaction because it took the input transaction at face value instead of updating the transaction in the graphAgentM10 years ago 8c77b4aadd branchB transaction to test merge result WIPAgentM10 years ago 9f12c25merge test success checkpointAgentM10 years ago 83fc9f0intermediate transaction graph test commitAgentM10 years ago