Pinned Loading

1. p2pd p2pd Public

   Asynchronous P2P networking library and service

   Python 61 3

2. h.h h.h Public

   Multi-platform, single-file, header-only, C / C++11 include for bootstrapping new projects.

   C 14 2

3. coinbend coinbend Public

   Prototype peer-to-peer coin swaps with micro-payment channels.

   JavaScript 10 7

4. crosschain_contract crosschain_contract Public

   Example code for a bitcoin-style cross-chain contract. Don't use this code.

   Python 1

5. pay_for_private_keys pay_for_private_keys Public

   Create contracts in Ethereum to atomically pay someone for a private key.

   Python 4 1

6. Git merge conflict resolve Python sc... Git merge conflict resolve Python script

   1

   Git's merge tool is kind of shitty with respect to rebase. It doesn't seem to acknowledge the working directory? So I made a simple Python script that lets you easily resolve merge conflicts. The diff tool it uses is Visual Studio Code (which is cross-platform.) This was necessary due to Visual Studios merge diffs being read-only.

   2

   3

   To use: install the script as /usr/bin/resres, set execute perms, mkdir ~/resres_merge , and on a conflicted file type: resres file.name. This will pop-up a diff view in Visual Studio Code. The changes you want to choose are on the left side split-view.

   4

   5

   Once you're done resolving the merge conflict, simply run the tool again on the same file to incorporate your changes. Run the tool multiple times if necessary to resolve all conflicts. It will tell you when you're done.