frc1418 / 2018-robot

:robot: Code for our 2018 competition robot, Panthera.
MIT License
3 stars 2 forks source link

Make scale back-up duration longer #141

Closed JosephCarpenter closed 6 years ago

ErikBoesen commented 6 years ago

Gotta remember to pull from upstream my boy

JosephCarpenter commented 6 years ago

hmm, seems to have added a few other things even though I did not have any conflicts/commits from other branches

JosephCarpenter commented 6 years ago

I love how this kind of thing never happens to me for large pull requests, just the mindless ones that would normally take thirty seconds.

ErikBoesen commented 6 years ago

You can just reset this commit, stash, checkout to master & pull from upstream then make the branch again and you should be good to recommit and force push

JosephCarpenter commented 6 years ago

Ech I did pull from upstream though

JosephCarpenter commented 6 years ago

Or did you make changes since yesterday

ErikBoesen commented 6 years ago

Well uh... try it again

ErikBoesen commented 6 years ago

Yeah, I did. It shouldn't try to undo them anyway, but it seems it is.

JosephCarpenter commented 6 years ago

I think I broke the bash editor

JosephCarpenter commented 6 years ago

When I type :wq it reads that as normal text rather than the command

ArchdukeTim commented 6 years ago

press escape first

JosephCarpenter commented 6 years ago

🤦

JosephCarpenter commented 6 years ago

Oof. I guess github doesn't allow face palm emojis.

JosephCarpenter commented 6 years ago

Oh no. Now it decided to wipe everything from deploy.sh

ArchdukeTim commented 6 years ago

yeah you still haven't rebased

JosephCarpenter commented 6 years ago

OH GOD WHAT DID I DO

ArchdukeTim commented 6 years ago

oh my lord

ArchdukeTim commented 6 years ago

whoops

ArchdukeTim commented 6 years ago
image

LMAO

ErikBoesen commented 6 years ago

HOO BOY

ErikBoesen commented 6 years ago

This is starting to look like one of my PRs

JosephCarpenter commented 6 years ago

@twinters007 yep just go ahead and close it this problem is fixed XD

ErikBoesen commented 6 years ago

@JosephCarpenter Can you try this again?