search

pep-dortmund / homepage-toolbox

Website for the PeP et al. Toolbox Workshop at TU Dortmund
http://toolbox.pep-dortmund.org
3 stars 1 forks source link

remove Atom (EOL) from the editors list #193

Closed NicoWeio closed 2 years ago

NicoWeio commented 2 years ago

See https://github.blog/2022-06-08-sunsetting-atom/

maxnoe commented 2 years ago

@NicoWeio I just noticed that in your different PRs, you happen to often include other commits from different branches.

When starting a new branch, make sure to start from main using (when on the fork):

git fetch upstream
git switch -c new_branch upstream/main

or 

git fetch origin
git switch -c new_branch origin/main

when in the main repo.

NicoWeio commented 2 years ago

Thanks, @maxnoe! That's what I did (still using checkout out of habit), but I didn't fetch before. Then, the rebase completed the chaos. Sorry for the ping, @chrbeckm!