This should probably be changed to just "Bitcoin Core GUI" or "Bitcoin Core".

it's there some kind of- particular naming convention for the branch, if it should be merged? I guess I didn't do that correctly in this instance

I think I've made the change you requested, is it so?

I think I've made a mistake which is, I made those changes directly in the window of GitHub, and they don't exist on my local repo, seems they're only in this patch here. Is there some way to incorporate those changes to my local repo so I can do the squashing procedure?

Is there some way to incorporate those changes to my local repo so I can do the squashing procedure?

git pull origin patch-4

(where origin is the name that you gave to your github remote)

so- origin/master? or... I just ran exactly git pull origin patch-4 and it seemed to work

now I need to issue the command git rebase -i HEAD~n isn't it? do you know how I can figure out what is n?

@s-matthew-english n is the number of commits you've made.

my terminal tells me I'm ahead of origin/master by 5 commits, so then- is it 5? how can I check that?

hmm, I've been trying to squash it for a while now, did it work?

I think I squashed them, I followed this tutorial: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

@s-matthew-english didn't seem to work. Did you force push?

yeah :/ strange

do I force push it to upstream/master or origin/master?

it depends on which one points to your repo. It's probably origin/master, but you can try both. The worst that will happen is that you will get an error about not being able to push to one of those.

what about this:

smatthewenglish@238fbce

Close. Do it for your patch-4 branch. Also, the commit message should be cut down to just one message that describes the changes simply.

hmm, is there a way to retroactively change to commit mesage? I think I've now done it for patch-4, did it work?

Nope. something very wrong happened. I think you pushed your whole master branch.

:/ shit- is there a way to... back it up to before I did that and then take another crack at it?

At this point you could just do it the "hard" way. Reset to Bitcoin master (git reset --hard upstream/master assuming upstream is to bitcoin/bitcoin) then make your final changes, commit, and force push.

on which branch 'patch-4'?

On Mon, Oct 17, 2016 at 5:36 PM, Andrew C [email protected] wrote:

At this point you could just do it the "hard" way. Reset to Bitcoin master
(git reset --hard upstream/master assuming upstream is to
bitcoin/bitcoin) then make your final changes, commit, and force push.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8908 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AIonIN8wQ9bs4D6FHdTP5hOONYbQYSyhks5q05YIgaJpZM4KTb1V
.

yes

:/ but when I run 'git merge-base patch-4 upstream/master' it says only
"noop"

On Mon, Oct 17, 2016 at 5:39 PM, Andrew C [email protected] wrote:

yes

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8908 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AIonIPtppENShC7-cH9nGZJAcHc6Zq_8ks5q05a_gaJpZM4KTb1V
.

Maybe this discussion can be held more effectively on IRC?

Don't do any merges. Just reset the branch like I told you above. You should end up doing something like this:

git checkout patch-4
git reset --hard upstream/master

# Do your changes again

git commit -a
git push -f origin

ok- I think I've just done it- did it work?

On Mon, Oct 17, 2016 at 5:45 PM, Andrew C [email protected] wrote:

Don't do any merges. Just reset the branch like I told you above. You
should end up doing something like this:

git checkout patch-4
git reset --hard upstream/master

Do your changes again

git commit -a
git push -f origin

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8908 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AIonIMek2Y1hGI3b1EB3dr4R5P1g1syfks5q05f_gaJpZM4KTb1V
.

Almost. Somehow a change to src/crypto/hmac_sha256.cpp slipped in.

Just remove that change and then use git commit -a --amend to modify the existing commit.

ok- I think I've done it. is it so?

On Mon, Oct 17, 2016 at 5:54 PM, Andrew C [email protected] wrote:

Almost. Somehow a change to src/crypto/hmac_sha256.cpp slipped in.

Just remove that change and then use git commit -a --amend to modify the
existing commit.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8908 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AIonIAMrSy4XKlQAaz51fLHkQ1-0s4k2ks5q05o_gaJpZM4KTb1V
.

Yes, it is correct now.

Please do a last git commit --ammend and make sure to apply the second git commit message rule: http://chris.beams.io/posts/git-commit/#seven-rules

:D cool- thank you for helping me figure this out

On Mon, Oct 17, 2016 at 6:01 PM, Andrew C [email protected] wrote:

Yes, it is correct now.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8908 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AIonIGIh8mufhLQd6WseIENp0t8MWSVDks5q05vHgaJpZM4KTb1V
.

how about that one?

utACK 164196b

utACK 164196b