[Idea] Handy tips for your daily fight with git

[Mte90]

Talk about the most common issue on sync a fork and push to it with rebase/merge

[Mte90]

• winning tactics for git newbie contributors
• A Guide To git for new contributors

[Mte90]

• https://github.com/k88hudson/git-flight-rules

[Mte90]

• git pull -r -> pull and rebase/ non funziona git checkout -f e poi reset
• merge vs rebase
• merge conflict richiede una operazione manuale -> commit -> push
• git diff -> patch
• git stash -> pull -r -> stash pop
• commit -> pull -r
• copia manuale come ultima risorsa -> stash per esperimenti
• git status
• git branch
• git log
• fare il ramo -> non sperimentare su master
• cherry pick

[Mte90]

http://turnoff.us/geek/when-ai-meets-git/

[Mte90]

https://i.redditmedia.com/sm_BsSYUvCpqGJtl6E2xEgc58gm6DV_wy6nVCfzv7Io.png?w=599&s=e3c98db8248b94662c0f6dbc6dbe3d3e

[Mte90]

https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/SubmittingPatches?id=HEAD#n102

[Mte90]

https://dev.to/aershov24/11-painful-git-interview-questions-you-will-cry-on-1n2g

[Mte90]

something about merge and sync a fork

[Mte90]

• Why your merge failed • Why you can’t push your changes • The difference between add and push • What a ‘fast forward’ is • What a ‘rebase’ is and why it’s important

Why people start use git:

• Sending each other updated files • Emailing each other when files change • Keeping tar files in a central location with version numbers

better cli that doesn't change compared to gui, and what you learn is better from clicking an UI

• git stash

[Mte90]

https://blog.benj.me/2019/10/10/github-workflow/

[Mte90]

dupe https://github.com/Mte90/mte90.github.io/issues/74