git.iko.soy/project-m36
on master help sign in
update changelog for info on automerge
commit7debe44bad44176c1f1abfa26dbfb5a1f74780a7 authorAgentM <agentm@themactionfaction.com> dateTue 1 Aug 2017, 12:50 (9 years ago) parent415eb12
1 file changed+10
compare with master
unifiedsplit
Changelog.markdown+10
Changelog.markdown+10
@@ -1,3 +1,13 @@
1+# 2017-08-01
2+
3+## autoMergeToHead
4+
5+In preparation for the simpler monad client API, ProjectM36.Client now includes a server-side merge for new transactions called "[automerge](https://github.com/agentm/project-m36/issues/33)". This feature should reduce head contention in cases where new transactions can be simply merged to the head without additional processing. The trade-off is reduced ```TransactionIsNotAHeadError```s but an increased chance of merge errors. The feature operates similarly to a server-side git rebase.
6+
7+## critical bug in merging
8+
9+Successfully merged transactions did not have their constraints validated. Fixed.
10+
111# 2017-06-12
212
313## add file locking