|
Title: Git question: how do I merge my old changes into the last source base? Post by: piotr_n on November 08, 2011, 07:45:32 PM Sorry, my problem is probably stupid for people who have experience with Git, but unfortunately I'm not one of them so I need to ask.
Back on 0.3.x I made a fork and then I did some changes. https://github.com/piotrnar/bitcoin-impexptx Now I would like to merge these changes into the latest source base. Must I delete the old fork/repo and start over again using my backup on the disk, or is there some other way? I cannot have two different forks, can I? Title: Re: Git question: how do I merge my old changes into the last source base? Post by: ThomasV on November 08, 2011, 08:35:42 PM Sorry, my problem is probably stupid for people who have experience with Git, but unfortunately I'm not one of them so I need to ask. Back on 0.3.x I made a fork and then I did some changes. https://github.com/piotrnar/bitcoin-impexptx Now I would like to merge these changes into the latest source base. Must I delete the old fork/repo and start over again using my backup on the disk, or is there some other way? I cannot have two different forks, can I? Hi, last time I tried, your import/export transaction patch worked, but the GUI part could not be fetched. I recycled the importtransaction patch for Electrum. I added an exception to handle the case where the transaction is rejected. (see line 31): https://gitorious.org/electrum/electrum/blobs/master/server/patches/bitcoinrpc.cpp.diff it would be great to create a pull request with importexporttx. Title: Re: Git question: how do I merge my old changes into the last source base? Post by: piotr_n on November 08, 2011, 08:42:01 PM Hmm... The GUI part also seems to be working fine on my PC.
Though, considering my lack of experience with git, I believe I could screw up something. But I don't want to spend any more time on wx, since we are switching to Qt anyway. And that's why I'm trying to merge it with the Qt code and then maybe create the pull request. Anyway, thanks for your modification - I will keep it in mind. Title: Re: Git question: how do I merge my old changes into the last source base? Post by: Andrew Vorobyov on November 08, 2011, 10:16:22 PM http://learn.github.com/p/rebasing.html
|