Fix signature helper

[BladeMF]

Fixes phpactor/phpactor#1168

[BladeMF]

BTW, is this normal - because this branch is based on the latest master branch it shows my merges from updating from phpactor/completion?

[dantleech]

Well, define "normal". you can avoid it with git rebase origin/master (assuming you did git merge origin/master or git pull.

you can "fix" it by git reset --hard origin/master git cherry-pick c714189. But like I say, it doesn't really matter as we squash to one commit anyway.

[BladeMF]

Well, I use the interface here to update my master branch from your master branch using a pull request. Not sure how to rebase my master from your master.

[dantleech]

You don't really need to worry about your master (or my master, the only one we care about is githubs master)

$ git fetch origin

fetches the "github" version of the code to your git repository as origin.

$ git rebase origin/master

will rebase your current branch on the "github" version of the code - it will reset your branch to the commit on origin/master and then replay your new commits on top of it - so that your commits are "based" on the latest commit from origin/master.

it may not work so well if you've already merged though - rebasing rewrites the history (your commits will have new IDs). but it just means that your code is "based" on the most recent commit of the branch you are merging to and you have a linear progression from from origin/master (the branch you're merging to).

[BladeMF]

This doesn't make any sense - my repo is a fork, origin/master should be the master branch of my fork in github.

This article says how to configure another remote for my local branch. Then it says I need to do this. It says if I hadn't touched my master (which I wouldn't have, because I'd be using branches) it would just fast-forward mine and it will be completely in sync. Maybe I should do that.

I wonder if I can reset my master branch onto that "upstream" branch...

I am sorry about this, this is all new to me. I'll need a bit of help until I find my way.

[dantleech]

Ah yes :) I'm so used to working on the main remote, you should indeed rebase on remote|upstream|whatever/master

rebase is better technically, as you won't get those Merge commits, but like I say it's not very important.

[BladeMF]

This is how I reset, found it. I would guess if I don't touch my master there won't be merge commits - just a fast-fotwared.

[BladeMF]

I'd rather have my master being in sync too in case I need to use it, is my other point.

[dantleech]

yeah, i use git fetch git reset --hard in preference to git pull git merge etc. I only merge if there are other people using that branch as a base.

[BladeMF]

Done, reset it. Will reset the others later.

[dantleech]

Yeah, absolutely not a problem :)

[dantleech]

Thanks, works great!