{"action":"created","issue":{"url":"https://api.github.com/repos/OmniLayer/omnicore/issues/12","labels_url":"https://api.github.com/repos/OmniLayer/omnicore/issues/12/labels{/name}","comments_url":"https://api.github.com/repos/OmniLayer/omnicore/issues/12/comments","events_url":"https://api.github.com/repos/OmniLayer/omnicore/issues/12/events","html_url":"https://github.com/OmniLayer/omnicore/issues/12","id":66447589,"number":12,"title":"Keep track of the progress of bitcoin:0.10","user":{"login":"dexX7","id":5836089,"avatar_url":"https://avatars.githubusercontent.com/u/5836089?v=3","gravatar_id":"","url":"https://api.github.com/users/dexX7","html_url":"https://github.com/dexX7","followers_url":"https://api.github.com/users/dexX7/followers","following_url":"https://api.github.com/users/dexX7/following{/other_user}","gists_url":"https://api.github.com/users/dexX7/gists{/gist_id}","starred_url":"https://api.github.com/users/dexX7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dexX7/subscriptions","organizations_url":"https://api.github.com/users/dexX7/orgs","repos_url":"https://api.github.com/users/dexX7/repos","events_url":"https://api.github.com/users/dexX7/events{/privacy}","received_events_url":"https://api.github.com/users/dexX7/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-04-05T14:59:27Z","updated_at":"2015-04-05T21:45:15Z","closed_at":null,"body":"Our current main branch is based on [bitcoin/bitcoin/tree/0.10](https://github.com/bitcoin/bitcoin/tree/0.10), but since then there has been some further progress.\r\n\r\nTo compare: https://github.com/OmniLayer/omnicore/compare/omnicore-0.0.10...bitcoin:0.10\r\n\r\nI suggest to keep our branch in sync, and adopt upstream changes (by cherry-picking?). What is your opinion on this?"},"comment":{"url":"https://api.github.com/repos/OmniLayer/omnicore/issues/comments/89858885","html_url":"https://github.com/OmniLayer/omnicore/issues/12#issuecomment-89858885","issue_url":"https://api.github.com/repos/OmniLayer/omnicore/issues/12","id":89858885,"user":{"login":"zathras-crypto","id":5633351,"avatar_url":"https://avatars.githubusercontent.com/u/5633351?v=3","gravatar_id":"","url":"https://api.github.com/users/zathras-crypto","html_url":"https://github.com/zathras-crypto","followers_url":"https://api.github.com/users/zathras-crypto/followers","following_url":"https://api.github.com/users/zathras-crypto/following{/other_user}","gists_url":"https://api.github.com/users/zathras-crypto/gists{/gist_id}","starred_url":"https://api.github.com/users/zathras-crypto/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zathras-crypto/subscriptions","organizations_url":"https://api.github.com/users/zathras-crypto/orgs","repos_url":"https://api.github.com/users/zathras-crypto/repos","events_url":"https://api.github.com/users/zathras-crypto/events{/privacy}","received_events_url":"https://api.github.com/users/zathras-crypto/received_events","type":"User","site_admin":false},"created_at":"2015-04-05T21:45:15Z","updated_at":"2015-04-05T21:45:15Z","body":"I'm both a yes and no - yes we should be adopting upstream changes, but no I don't think we should be tracking each change and keeping our branch in sync.\r\n\r\nBasically any commits that make it into a release (say Bitcoin 0.10.1) we absolutely want, but I'm very conscious that we don't adopt upstream changes *before* they do.  Example:\r\n\r\n1) Bitcoin devs merge commit abcd1234 into 10 branch\r\n2) We adopt this in our branch\r\n3) We hit release point and release Omnicore 0.0.10\r\n4) Bitcoin devs revert commit abcd1234 because they found an issue with it, abcd1234 does not make it into Bitcoin 0.10.1\r\n\r\nWe then include code that Bitcoin does not.  I'm not sure how likely the above scenario is - it's just something that popped into mind.   Thoughts?"}}