search

openscad / openscad.github.com

28 stars 40 forks source link

Michael at oz cheetsheet colours #84

Closed MichaelAtOz closed 5 years ago

MichaelAtOz commented 5 years ago

How about this? cheatsheet color MM

MichaelAtOz commented 5 years ago

I just noticed I dropped 'Cheatsheet' from the title. Do we need it, tautology?

t-paul commented 5 years ago

Looks good.

MichaelAtOz commented 5 years ago

You’re all set—the MichaelAtOz:MichaelAtOz-cheetsheet-colours branch can be safely deleted.

This branch [MichaelAtOz:master] is 4 commits behind openscad:master.

@t-paul so I should delete my branch then pull the original master into my fork again. Is that how it works?

t-paul commented 5 years ago

If you do it the other way around, git will also notice that things are merged, so it should be possible to delete via git branch -d instead of forcing it by git branch -D.

If the local repo is cloned from the personal github and has the openscad repo as upstream remote like

$ git remote -v
origin    git@github.com:t-paul/openscad.git (fetch)
origin    git@github.com:t-paul/openscad.git (push)
upstream  git@github.com:openscad/openscad.git (fetch)
upstream  git@github.com:openscad/openscad.git (push)

the following should update everything.

git checkout master
git pull upstream master    # sync local master with openscad repo
git branch -d cheatsheet    # delete local branch (still remains on the personal repo)
git push                    # push updated master to personal repo