search

kelvinfan001 / findalicious

Swipe through restaurants with friends and decide on where to eat! (Formerly Chicken Tinder)
https://findalicious.herokuapp.com
GNU General Public License v3.0
5 stars 1 forks source link

Add ESLint & Prettier config #109

Closed avatarneil closed 3 years ago

avatarneil commented 3 years ago

Supplants #105, to try and avoid merge conflicts 🙏

avatarneil commented 3 years ago

My fork must've gotten out of sync, ugh. Will try again.

kelvinfan001 commented 3 years ago

Have you tried

git fetch upstream
git rebase upstream/master
git push -f

or were the conflicts during the git rebase upstream/master step already too overwhelming (this might be the case if origin/master hasn't been rebased against upstream/master in a while and the current branch was checked out from the out-of-date origin/master)?

I did also commit the mortal sin of force-pushing to master last night so maybe that was it.

kelvinfan001 commented 3 years ago

@avatarneil I may be wrong (wasn't able to clone your PR), but it doesn't look like commit 8ab0cd9e56 should have many conflicts with the current master; hopefully the fix was as simple as cherry-picking this one commit :)

avatarneil commented 3 years ago

@kelvinfan001 Ahh, yes, the force-push to master is probably what horked stuff. My fork's master is totally out of wack, and rebasing the upstream on top of it still elicits weirdness. I'll probably just re-fork and cherry-pick there. You're correct, there shouldn't be that many conflicts (if any), but git is rather confused :P

kelvinfan001 commented 3 years ago

@avatarneil Sincere apologies for the force-push (will definitely NOT do that again). Unfortunately, this might also mean your other PR may be borked 😱. I'm really hoping cherry-picking goes smoothly for the changes in the Add Unit Settings PR. Anyways, this is a textbook example of why force-pushing to a branch that is used by others is a HORRIBLE IDEA.

Edit: master is now protected from force-pushing :)