[00:20:57] <navcoin-bot> <salmonskinroll> how to i merge two different PRs locally?
[00:21:17] <navcoin-bot> <salmonskinroll> trying to test the newer ones with 634 as well
[00:22:23] <navcoin-bot> <salmonskinroll> on test net
[00:27:21] <navcoin-bot> <aguycalled> git remote add aguycalled http://www.github.com/aguycalled/navcoin-core git fetch aguycalled git pull aguycalled branch
[00:39:06] <navcoin-bot> <salmonskinroll> i mean merging two together, say 634 and 642
[00:39:30] <navcoin-bot> <salmonskinroll> do i check out 634 and then git pull 642?
[00:48:33] <navcoin-bot> <aguycalled> yep
[00:48:42] <navcoin-bot> <salmonskinroll> okie dokie
[01:06:02] <navcoin-bot> <salmonskinroll> how is cfund pay out block decided?
[01:06:18] <navcoin-bot> <aguycalled> its a block which includes a payment of a proposal
[01:06:40] <navcoin-bot> <salmonskinroll> right, but when will the payout happen?
[01:06:49] <navcoin-bot> <salmonskinroll> it seems like it's in the middle of a block cycle
[01:07:16] <navcoin-bot> <aguycalled> once the payment request is accepted and matures 50 blocks
[01:07:21] <navcoin-bot> <aguycalled> for mainnet
[01:07:26] <navcoin-bot> <aguycalled> 5 for testnet
[01:07:45] <navcoin-bot> <salmonskinroll> i see, im on devnet and i got a payout at blockheight 426
[01:08:03] <navcoin-bot> <aguycalled> yes matured at 425, paid at 426
[01:08:12] <navcoin-bot> <salmonskinroll> got it
[01:39:31] <navcoin-bot> <salmonskinroll> what does the filter "mine" do?
[01:39:59] <navcoin-bot> <aguycalled> show proposals created by ur wallet
[01:40:12] <navcoin-bot> <salmonskinroll> got it