codewars / blog

The Codewars Blog
https://blog.codewars.com
MIT License
9 stars 3 forks source link

What has 2020 brought to us #11

Closed hobovsky closed 3 years ago

hobovsky commented 3 years ago

My attempt on the first post announcing changes which happened on Codewars.

I was not sure how much details to put here, so I decided to have just a summary, and a couple of follow-up posts published separately with more details on some topics. Please let me know how it works for you.

hobovsky commented 3 years ago

Can you remove build/zola.exe?

Uh, I thought I have, but apparently not.

kazk commented 3 years ago

You need to first pull the changes from upstream (this repo) into your fork. I usually do:

git checkout main
git pull upstream main
git push # update the fork on GitHub
git checkout a-branch-name
git rebase main # this will make your changes on top of the updated main
git push --force-with-lease # update the branch for PR

I prefer using rebase for feature branches because the history is cleaner, but you can use merge too.

kazk commented 3 years ago

If you haven't set the upstream, then you need to do that first:

git remote add upstream git@github.com:codewars/blog.git