How to create a PULL request - page 2.

wumpus

hero member

Activity: 812

Merit: 1022

No Maps for These Territories

Quote from: Cryddit on November 02, 2013, 02:11:13 PM

I want to throw away all local changes, including those committed to the local git repository, and make my project directories look exactly like the ones that were most recently checked into the remote master, from a different git repository.

Code:

git reset --hard origin/master

(or replace 'origin' with whatever you called the remote)

git revert is there to revert already checked-in commits with a reverse patch. You will likely use it very sparingly, if at all.

virtualmaster

hero member

Activity: 504

Merit: 500

Thanks for the tutorial.

Cryddit

legendary

Activity: 924

Merit: 1129

I'm having a fight with git.

Here's what I want to do.

I want to throw away all local changes, including those committed to the local git repository, and make my project directories look exactly like the ones that were most recently checked into the remote master, from a different git repository.

That is, with NO attempt to "merge" local changes, NO local files hanging around that aren't in the upstream, NO version garbage inserted into files ... Just plain abandon this branch and go back to trunk development.

In every other revision control system I've ever encountered, that is a simple command. But either I am too stupid to know how the hell to ask Git to do this, or Git is too stupid to get it done.

"Git revert" doesn't even destroy local files that aren't part of the version you're reverting to! What the hell is wrong here?

freedomno1

legendary

Activity: 1806

Merit: 1090

Learning the troll avoidance button :)

Well just got it
Still a bit technical need to keep learning
Thanks for the info Grin

GambitBTC

sr. member

Activity: 476

Merit: 250

Great tut +1 for the info

rbgrish

newbie

Activity: 27

Merit: 0

Well Said oleganza!

oleganza

full member

Activity: 200

Merit: 104

Software design and user experience.

Quote from: robamichael on January 12, 2013, 12:22:15 AM

Is it fair to say then, that Bitcoin is not completely decentralized? I am only asking to better my understanding, but it seems there is some amount, even if minor, of centralization.

To me, Bitcoin is valuable not because of how much it is "decentralized" and "democratic", but simply because it allows choice including option to exit the club at any time. I have a choice to build my own software, I have choice to suggest an improvement to others, I have choice to mine coins myself, or buy them, or stash them away and sell any time in the future. Of course, my freedom of choice is limited by my resources and your willingness to cooperate with me. But that's voluntary. Neither you, nor me can impose our will on each other. So I can use bitcoins with peace of mind knowing that they are built on top of voluntary interactions instead of enslavement. If I get rich or poor, it will be only because of my voluntary choices, so there will be no one to blame but myself.

robamichael

full member

Activity: 144

Merit: 100

Right - maybe the word "completely" was stronger than what I needed.

The mechanics of bitcoin differ from something like gold, because gold was created by nature, and bitcoin is managed by people. And anything managed by people is centralized to some extent.

I will do some reading and try to understand the PULL process.

Gavin Andresen

legendary

Activity: 1652

Merit: 2216

Chief Scientist

Quote from: robamichael on January 12, 2013, 12:22:15 AM

Is it fair to say then, that Bitcoin is not completely decentralized? I am only asking to better my understanding, but it seems there is some amount, even if minor, of centralization.

The only completely and utterly decentralized bitcoin-like system I can think of would have every person using it write and run their own code.

On computers that they built themselves.

Communicating over a wireless mesh network where each node in the mesh was controlled by a single person who wrote all the code and built all the hardware....

robamichael

full member

Activity: 144

Merit: 100

Quote from: kjj on January 11, 2013, 12:28:44 AM

Whether or not your pulls get accepted depends on a rough consensus of the devs. Some of them have a bit more pull than the others, but there isn't like a formal voting process.

If you are submitting pulls, you'll get emails from github when people comment on it. Pay attention to those, the people making them are giving advice earned through hard experience. Address their concerns when you can, and be prepared to defend your choices.

Also start hanging out in #bitcoin-dev on IRC. It can be very helpful to start conversations about your pull, particularly with the people that have commented on it. Be polite, and keep in mind that they can be busy, even if you can't see it.

Thank you for your advice. I definitely will be checking out the IRC channel.

Is it fair to say then, that Bitcoin is not completely decentralized? I am only asking to better my understanding, but it seems there is some amount, even if minor, of centralization.

kjj

legendary

Activity: 1302

Merit: 1025

Whether or not your pulls get accepted depends on a rough consensus of the devs. Some of them have a bit more pull than the others, but there isn't like a formal voting process.

If you are submitting pulls, you'll get emails from github when people comment on it. Pay attention to those, the people making them are giving advice earned through hard experience. Address their concerns when you can, and be prepared to defend your choices.

Also start hanging out in #bitcoin-dev on IRC. It can be very helpful to start conversations about your pull, particularly with the people that have commented on it. Be polite, and keep in mind that they can be busy, even if you can't see it.

robamichael

full member

Activity: 144

Merit: 100

Quote from: TierNolan on June 28, 2011, 12:19:39 PM

Quote from: muc on June 28, 2011, 10:21:47 AM

For those of us that are ignorant, can somebody tell me what a PULL request in layman's terms is? And what is it used for?

Since the project is open source, anyone can change the files. However, this creates a "fork", their version of the software is different from everyone else's. This means that they need to incorporate any future changes into their fork.

A pull request allows them to submit the change back to the main project. If it is accepted, the changes become part of the official version of the software.

Is the decision for acceptance determined by a developer?

jgarzik

legendary

Activity: 1596

Merit: 1091

Quote from: Andreas Schildbach on July 01, 2012, 04:46:26 AM

Quote from: Gavin Andresen on March 17, 2011, 01:29:21 PM

after discussion and argument and nit-picking and revision

What happens if I already submitted the pull request and then commit a fix to my patch, so there are now 2 commits in that pull request. Am I supposed to squash the commits into one? Do I need to re-submit my pull request afterwards?

You do not have to resubmit the pull request. Squash the commits into one, and then "git push --force" to "rebase" the branch.

Andreas Schildbach

hero member

Activity: 483

Merit: 501

Quote from: Gavin Andresen on March 17, 2011, 01:29:21 PM

after discussion and argument and nit-picking and revision

What happens if I already submitted the pull request and then commit a fix to my patch, so there are now 2 commits in that pull request. Am I supposed to squash the commits into one? Do I need to re-submit my pull request afterwards?

kurtosis

newbie

Activity: 17

Merit: 0

or optionally (for posterity of a stickied thread):

Code:

git add -A
git commit -m 'added awesome new feature'
git push -u origin master

Explanations for -A and -u. Generally only use -A if all the modifications to be committed are a single bundle of functionality, describable by the same commit message.

finway

hero member

Activity: 714

Merit: 500

I've made a new locale file "bitcoin_zh_CN.ts",How can i upload it to my github fork and make a pull request?

I've made my fork of bitcoin on github.com, I've installed Git, and cloned my fork.
I ran
git push origin master
It shows:
everything up-to-date
and nothing changed to my fork on github.com

but i've copy "bitcoin_zh_CN.ts" to the directory "bitcoin/src/qt/locale",
clearly

What should i do? (http://github.com/finway-china/bitcoin)

EDIT:
Yeah, done my first pull request

git add bitcoin_zh_CN.ts
git commit
EDIT
git push origin master

casascius

vip

Activity: 1386

Merit: 1136

The Casascius 1oz 10BTC Silver Round (w/ Gold B)

Can anyone help me figure out how to do the following?

1. Get the latest version at bitcoin/bitcoin
2. Apply just sipa's pull request called "Wallet Import and Export" to my own copy so I can compile it in.

Thanks

EDIT: Asking a question seems to guarantee I will find the answer right after I ask. My end result was to git clone bitcoin/bitcoin, and then download https://github.com/bitcoin/bitcoin/pull/220.diff, then git apply, then compile.

ampkZjWDQcqT

member

Activity: 70

Merit: 10

GNU is not UNIX

Quote from: muc on June 28, 2011, 10:21:47 AM

For those of us that are ignorant, can somebody tell me what a PULL request in layman's terms is? And what is it used for?

It can be properly understood when you know what a Distributed Version Control System is. Start with http://progit.org/book/.

TierNolan

legendary

Activity: 1232

Merit: 1083

Quote from: muc on June 28, 2011, 10:21:47 AM

For those of us that are ignorant, can somebody tell me what a PULL request in layman's terms is? And what is it used for?

Since the project is open source, anyone can change the files. However, this creates a "fork", their version of the software is different from everyone else's. This means that they need to incorporate any future changes into their fork.

A pull request allows them to submit the change back to the main project. If it is accepted, the changes become part of the official version of the software.

muc

newbie

Activity: 42

Merit: 0

For those of us that are ignorant, can somebody tell me what a PULL request in layman's terms is? And what is it used for?

Topic: How to create a PULL request - page 2. (Read 90813 times)