ipfs-inactive / developer-meetings

[ARCHIVED] 2018 IPFS Developers Meeting in Berlin
17 stars 16 forks source link

Add outcome of the GraphSync Deep-Dive #41

Closed vmx closed 5 years ago

daviddias commented 5 years ago

@vmx can you resolve the merge conflicts?

vmx commented 5 years ago

@daviddias Sure. Just out of curiosity: Why are all directories now screaming all uppercase? I personally find lowercase easier to read and navigate on a terminal.

vmx commented 5 years ago

@daviddias I don't have push access.

vmx commented 5 years ago

@daviddias You wouldn't need to do a rename (you still have a conflict). You would just cherry pick the original commit on top of master and then do a force push.