search

ElementalCode / elemental

A drag and drop block-based coding environment for front-end web technologies.
http://elementalcode.herokuapp.com
35 stars 10 forks source link

Added offset to fix pushed-up problem... #257

Closed iamunknown2 closed 7 years ago

iamunknown2 commented 7 years ago

…, but helper layer in intro.js is now off for a tutorial step when the offset is activated.

mrjacobbloom commented 7 years ago

oh god this PR is dependent on #249 why is everything so complicated

iamunknown2 commented 7 years ago

oh god this PR is dependent on #249 why is everything so complicated

It isn't that hard to merge - there's a merge button right on this page...

mrjacobbloom commented 7 years ago

oh god this PR is dependent on #249 why is everything so complicated

It isn't that hard to merge - there's a merge button right on this page...

yeah but if we merged this before 249 then it would probably break everything

iamunknown2 commented 7 years ago

yeah but if we merged this before 249 then it would probably break everything

I've tested a merge of my branch with gh-pages locally, and there doesn't seem to any merge conflicts.

mrjacobbloom commented 7 years ago

okay good, the thing that was scaring me was

screen shot 2017-04-20 at 8 21 58 am

it's set to merge into the branch rework-blocks... remember that the branch #249 is merging is on Airhogs777/elemental, and the rework-blocks branch on this repo is just for testing

we'll just have to make sure to manually merge it with gh-pages instead of hitting the "merge PR" button which will probably send it to rework-blocks

mrjacobbloom commented 7 years ago

see this is what it actually looks like because it's based on the changes made in my PR

iamunknown2 commented 7 years ago

What's wrong with merging this into 249?

mrjacobbloom commented 7 years ago

Because 249 isn't merging in ElementalCode/elemental:rework-blocks, it's merging in Airhogs777/elemental:rework-blocks

matthewr6 commented 7 years ago

ok so this is why we should have a single repo and only branch off the main repo

mrjacobbloom commented 7 years ago

true

but also merging a PR into another PR feels wrong

matthewr6 commented 7 years ago

@Airhogs777 can you talk on discord rn

matthewr6 commented 7 years ago

@Airhogs777 Ok, PRs fixed and stuff. I feel like merging a branch into another non-master branch is fine via PR provided it's someone who's trying to make changes to your stuff - at which point it's up to you to determine whether to merge it

mrjacobbloom commented 7 years ago

Sorry I'm at work and just saw this. Thanks for fixing this