search

TechforgoodCAST / cast-website

CAST website
htttp://www.wearecast.org.uk
0 stars 0 forks source link

Spacing of Get Involved fixed #157

Closed eghale closed 7 years ago

eghale commented 7 years ago

Not sure why I can't merge this into Staging but it said ellie was already up to date with that.

andrewMacmurray commented 7 years ago

@eghale have you committed your changes?

eghale commented 7 years ago

@andrewMacmurray I thought so..

On branch ellie Your branch is up-to-date with 'origin/ellie'. nothing to commit, working tree clean

eghale commented 7 years ago

Is there a way to just COMMIT ALL THE THINGS to the master branch and push it? Pretty sure it's all fine... (famous last words..)

andrewMacmurray commented 7 years ago

@eghale ah, you've done the branch merges the wrong way round, the base branch is staging and you need to merge ellie into it

andrewMacmurray commented 7 years ago

we'll close this pr and can you open a new one with the branches the other way round?