osagaius

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = git@github.com:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

osagaius

This preso made CRDTs really click for me

- http://richard.dallaway.com/crdt/

But only after reading this paper which describes a CRDT imlemented as a tree of edits.

- https://hal.inria.fr/file/index/docid/445975/filename/icdcs09-treedoc.pdf

Grokking how conflict resolution is determined is key I think. The CRDT will hold every party's