Contributing To The Core

My part of the presentation from Umbraco Codegarden 15.

Created and presented with Deckset (http://decksetapp.com) using the "Sketchnotes" theme (blue). ZIP of files here for scrutiny: http://greystate.dk/resources/presentations/2015/cg15.zip

Credits:
Movie clips used: "Houston we have a problem" from "Apollo 13", and "They have a cave troll" from "Lord of the Rings - The Fellowship of the Ring".
Merge/rebase illustrations from this article: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/

Transcript

1. Contributing to the Core #CG15 - Contributing to the Core
2. What's to cover? 4 Cleaning up a Pull Request 4 Keeping a fork updated 4 Merge conflicts #CG15 - Contributing to the Core
3. Cleaning up a Pull Request #CG15 - Contributing to the Core
4. #CG15 - Contributing to the Core
5. #CG15 - Contributing to the Core
6. Cleaning up a Pull Request 1. Edit commit messages 2. Squash/fixup commits #CG15 - Contributing to the Core
7. "Interactive rebase", you say? #CG15 - Contributing to the Core
8. git rebase --interactive 9ae9d49 #CG15 - Contributing to the Core
9. #CG15 - Contributing to the Core
10. Caution: Don't rebase commits you've already pushed! #CG15 - Contributing to the Core
11. How to undo (almost) anything with Git github.com/blog/2019-how-to-undo-almost-anything-with-git #CG15 - Contributing to the Core
12. Keeping a fork updated #CG15 - Contributing to the Core
13. Fewer changes 4 Easier for the maintainer to see through "noisy" stuff 4 Avoids potentially large merge conflicts #CG15 - Contributing to the Core
14. #CG15 - Contributing to the Core
15. #CG15 - Contributing to the Core
16. How to? 1. You need to track the Umbraco/Umbraco-CMS repo 4 You need an upstream remote 2. You need to get any changes down to your repo 4 You need to fetch from that remote 3. You want to add your code on top of new stuff 4 You need to rebase your branch #CG15 - Contributing to the Core
17. Setup: git remote add upstream https://github.com/Umbraco/Umbraco-CMS Grab the changes (if any): git fetch upstream Catch up: git rebase upstream/dev-v7 #CG15 - Contributing to the Core
18. But that sounds so magical! Does it really work?? #CG15 - Contributing to the Core
19. ! (…) #CG15 - Contributing to the Core
20. Very likely: 4 Typo-fixes, language additions etc. Probably not: 4 Large refactorings, etc. #CG15 - Contributing to the Core
21. Merge conflicts #CG15 - Contributing to the Core
22. “Guys…? Um… we have a merge conflict.” #CG15 - Contributing to the Core
23. #CG15 - Contributing to the Core
24. #CG15 - Contributing to the Core
25. Don't panic! ! #CG15 - Contributing to the Core
26. Protip: You can get back to where you were before you went and typed merge… #CG15 - Contributing to the Core
27. Just know this: 4 You didn't just lose all your stuff 4 It's all there 4 Use git merge --abort to bail out #CG15 - Contributing to the Core
28. Use git mergetool to launch a GUI #CG15 - Contributing to the Core
29. #CG15 - Contributing to the Core
30. We're available for questions & help etc. Come join us in the Café! #CG15 - Contributing to the Core
31. Sebastiaan: @cultiv github.com/nul800sebastiaan Chriztian: @greystate github.com/greystate #CG15 - Contributing to the Core