Bitcoin Forum
December 10, 2016, 11:07:53 AM *
News: Latest stable version of Bitcoin Core: 0.13.1  [Torrent].
 
   Home   Help Search Donate Login Register  
Pages: [1]
  Print  
Author Topic: Git question: how do I merge my old changes into the last source base?  (Read 788 times)
piotr_n
Legendary
*
Offline Offline

Activity: 1512


aka tonikt


View Profile WWW
November 08, 2011, 07:45:32 PM
 #1

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?

Check out gocoin - my original project of a bitcoin client written in Go, with some unique features.
PGP fingerprint: AB9E A551 E262 A87A 13BB  9059 1BE7 B545 CDF3 FD0E
1481368073
Hero Member
*
Offline Offline

Posts: 1481368073

View Profile Personal Message (Offline)

Ignore
1481368073
Reply with quote  #2

1481368073
Report to moderator
1481368073
Hero Member
*
Offline Offline

Posts: 1481368073

View Profile Personal Message (Offline)

Ignore
1481368073
Reply with quote  #2

1481368073
Report to moderator
Advertised sites are not endorsed by the Bitcoin Forum. They may be unsafe, untrustworthy, or illegal in your jurisdiction. Advertise here.
1481368073
Hero Member
*
Offline Offline

Posts: 1481368073

View Profile Personal Message (Offline)

Ignore
1481368073
Reply with quote  #2

1481368073
Report to moderator
1481368073
Hero Member
*
Offline Offline

Posts: 1481368073

View Profile Personal Message (Offline)

Ignore
1481368073
Reply with quote  #2

1481368073
Report to moderator
ThomasV
Legendary
*
Offline Offline

Activity: 1722



View Profile WWW
November 08, 2011, 08:35:42 PM
 #2

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.

Electrum: the convenience of a web wallet, without the risks
piotr_n
Legendary
*
Offline Offline

Activity: 1512


aka tonikt


View Profile WWW
November 08, 2011, 08:42:01 PM
 #3

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.

Check out gocoin - my original project of a bitcoin client written in Go, with some unique features.
PGP fingerprint: AB9E A551 E262 A87A 13BB  9059 1BE7 B545 CDF3 FD0E
Andrew Vorobyov
Hero Member
*****
Offline Offline

Activity: 565



View Profile
November 08, 2011, 10:16:22 PM
 #4

http://learn.github.com/p/rebasing.html

Pages: [1]
  Print  
 
Jump to:  

Sponsored by , a Bitcoin-accepting VPN.
Powered by MySQL Powered by PHP Powered by SMF 1.1.19 | SMF © 2006-2009, Simple Machines Valid XHTML 1.0! Valid CSS!