Closed JosephCarpenter closed 6 years ago
hmm, seems to have added a few other things even though I did not have any conflicts/commits from other branches
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.
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
Ech I did pull from upstream though
Or did you make changes since yesterday
Well uh... try it again
Yeah, I did. It shouldn't try to undo them anyway, but it seems it is.
I think I broke the bash editor
When I type :wq it reads that as normal text rather than the command
press escape first
🤦
Oof. I guess github doesn't allow face palm emojis.
Oh no. Now it decided to wipe everything from deploy.sh
yeah you still haven't rebased
OH GOD WHAT DID I DO
oh my lord
whoops
LMAO
HOO BOY
This is starting to look like one of my PRs
@twinters007 yep just go ahead and close it this problem is fixed XD
@JosephCarpenter Can you try this again?
Gotta remember to pull from upstream my boy