![$ git add --patch
diff --git a/layout/models.py b/layout/models.py
index f2dd5a8..b4dd522 100644
--- a/layout/models.py
+++ b/layout/models.py
@@ -27,7 +27,7 @@ class Layout(models.Model):
def __str__(self):
if self.is_layplan:
- return "Layplan: {}".format(self.data.get("slug", self.code))
+ return "Layplan: {}".format(self.data.get("name", self.code))
else:
return "Layout: {}".format(self.code)
Stage this hunk [y,n,q,a,d,e,?]?](https://image.slidesharecdn.com/simplify-with-deliberate-commits-lrug-june-2019-190611145322/85/Simplify-writing-code-with-deliberate-commits-39-320.jpg)
![Correct the colour of FAQ link in course notice footer
PT: https://www.pivotaltracker.com/story/show/84753832
In some email clients the colour of the FAQ link in the
course notice footer was being displayed as blue instead of
white. The examples given in PT are all different versions of
Outlook. Outlook won't implement CSS changes that include `!
important` inline[1]. Therefore, since we were using it to
define the colour of that link, Outlook wasn't applying that
style and thus simply set its default style (blue, like in
most browsers). Removing that `!important` should fix the
problem.
[1] https://www.campaignmonitor.com/blog/post/3143/
outlook-2007-and-the-inline-important-declaration/](https://image.slidesharecdn.com/simplify-with-deliberate-commits-lrug-june-2019-190611145322/85/Simplify-writing-code-with-deliberate-commits-49-320.jpg)
Simplify writing code with deliberate commits
- 1. Simplify writing code with deliberate commits LRUG - June 2019 Joel Chippindale - @joelchippindale
- 2. Joel Chippindale CTO at Unmade Video © Rapha Racing Limited 2019. All rights reserved
- 3. “If you can’t explain it simply, you don’t understand it well enough.” - Albert Einstein (probably) en.wikiquote.org/wiki/Albert_Einstein
- 4. Image by Cory Doctorow (CC BY-SA) Our work requires us to make changes to complex systems
- 5. @joelchippindale We learn to break down complex problems into small, simple steps
- 6. Image by WOCinTech Chat (CC BY) Great developers are really good at breaking problems into simple steps
- 7. @joelchippindale This takes discipline and willpower...
- 8. @joelchippindale ...but we can learn to make it easier
- 9. @joelchippindale When I started using git it changed the way that I developed software
- 10. 5 Practices 1. Plan your commits 2. Use single purpose branches 3. Make atomic commits 4. Write good commit messages 5. Rewrite your history to tell a story (early and often)
- 11. Image by Alexander Baxevanis (CC BY) Practice 1: Plan your commits
- 12. @joelchippindale Make a plan for the commits that you will make
- 13. @joelchippindale What if you don't know enough yet to make a plan?
- 14. @joelchippindale What if the plan changes?
- 15. @joelchippindale Plan your commits ahead of time and re-plan when you need to
- 16. Image by Jon Bennet Practice 2: Use single purpose branches
- 17. @joelchippindale Name your branch to reflect it's (single) purpose
- 18. @joelchippindale Notice when you are starting to work on something else
- 19. @joelchippindale Notice if a commit has value independent of the branch
- 20. @joelchippindale ...and if it does, then 'cherry pick' it onto master
- 21. git cherry-pick # Enables you to apply a single # commit from another branch # onto master
- 31. @joelchippindale Keep focussed by making each development branch single purpose
- 32. Image by lupusphotos (CC BY) Practice 3: Make atomic commits
- 33. @joelchippindale Decide the one change you are going to make and commit it
- 34. @joelchippindale How big a change should I make?
- 36. @joelchippindale Be suspicious of 'and' in your commit message
- 37. @joelchippindale Notice when you start doing something else and stop
- 38. git add --patch # Enables you to review all your # changes and decide which to # add to your commit
- 39. $ git add --patch diff --git a/layout/models.py b/layout/models.py index f2dd5a8..b4dd522 100644 --- a/layout/models.py +++ b/layout/models.py @@ -27,7 +27,7 @@ class Layout(models.Model): def __str__(self): if self.is_layplan: - return "Layplan: {}".format(self.data.get("slug", self.code)) + return "Layplan: {}".format(self.data.get("name", self.code)) else: return "Layout: {}".format(self.code) Stage this hunk [y,n,q,a,d,e,?]?
- 40. @joelchippindale Make each step simple by making atomic commits
- 41. Image by Ginny (CC BY-SA) Practice 4: Write good commit messages
- 42. dc8f609 It worked for me a813998 Final commit, ready for tagging 834a288 Don't push this commit 7cd9b24 WTF 901b51c done. going to bed now. 57d298f WIP 704de26 This will definitely work b4512c6 This might work d90b710 Trying to fix it again c57b012 Debug stuff Note: These messages are mostly taken from http://whatthecommit.com
- 43. @joelchippindale What does good look like?
- 44. Short one line title Longer description of what the change achieves (if the title isn’t enough). An explanation of why the change is being made. Perhaps a discussion of context and/or alternatives that were considered.
- 45. Short one line title Longer description of what the change achieves (if the title isn’t enough). An explanation of why the change is being made. Perhaps a discussion of context and/or alternatives that were considered.
- 46. Short one line title Longer description of what the change achieves (if the title isn’t enough). An explanation of why the change is being made. Perhaps a discussion of context and/or alternatives that were considered.
- 47. Short one line title Longer description of what the change achieves (if the title isn’t enough). An explanation of why the change is being made. Perhaps a discussion of context and/or alternatives that were considered.
- 48. Short one line title Longer description of what the change achieves (if the title isn’t enough). An explanation of why the change is being made. Perhaps a discussion of context and/or alternatives that were considered.
- 49. Correct the colour of FAQ link in course notice footer PT: https://www.pivotaltracker.com/story/show/84753832 In some email clients the colour of the FAQ link in the course notice footer was being displayed as blue instead of white. The examples given in PT are all different versions of Outlook. Outlook won't implement CSS changes that include `! important` inline[1]. Therefore, since we were using it to define the colour of that link, Outlook wasn't applying that style and thus simply set its default style (blue, like in most browsers). Removing that `!important` should fix the problem. [1] https://www.campaignmonitor.com/blog/post/3143/ outlook-2007-and-the-inline-important-declaration/
- 50. @joelchippindale Clear space in your head by writing good commit messages
- 51. Image by Nic McPhee (CC BY-SA) Practice 5: Rewrite your history to tell a simple story (early and often)
- 52. @joelchippindale You make mistakes and change your mind
- 53. git rebase --interactive # Enables you to move, reorder, # edit, merge and split your # commits
- 54. 343eed2 Fix typo in foo ba66794 Add bar 90328f9 Add foo
- 55. git rebase --interactive master
- 56. 1 pick 90328f9 Add foo 2 pick ba66794 Add bar 3 pick 343eed2 Fix typo in foo 4 5 # Rebase c405e59..343eed2 onto c405e59 (3 commands) 6 # 7 # Commands: 8 # p, pick <commit> = use commit 9 # r, reword <commit> = use commit, but edit the commit message 10 # e, edit <commit> = use commit, but stop for amending 11 # s, squash <commit> = use commit, but meld into previous commit 12 # f, fixup <commit> = like "squash", but discard this commit's log message 13 # x, exec <command> = run command (the rest of the line) using shell 14 # b, break = stop here (continue rebase later with 'git rebase --continue') 15 # d, drop <commit> = remove commit 16 # l, label <label> = label current HEAD with a name 17 # t, reset <label> = reset HEAD to a label
- 57. 1 pick 90328f9 Add foo 2 pick 343eed2 Fix typo in foo 3 pick ba66794 Add bar 4 5 # Rebase c405e59..343eed2 onto c405e59 (3 commands) 6 # 7 # Commands: 8 # p, pick <commit> = use commit 9 # r, reword <commit> = use commit, but edit the commit message 10 # e, edit <commit> = use commit, but stop for amending 11 # s, squash <commit> = use commit, but meld into previous commit 12 # f, fixup <commit> = like "squash", but discard this commit's log message 13 # x, exec <command> = run command (the rest of the line) using shell 14 # b, break = stop here (continue rebase later with 'git rebase --continue') 15 # d, drop <commit> = remove commit 16 # l, label <label> = label current HEAD with a name 17 # t, reset <label> = reset HEAD to a label
- 58. 1 pick 90328f9 Add foo 2 fixup 343eed2 Fix typo in foo 3 pick ba66794 Add bar 4 5 # Rebase c405e59..343eed2 onto c405e59 (3 commands) 6 # 7 # Commands: 8 # p, pick <commit> = use commit 9 # r, reword <commit> = use commit, but edit the commit message 10 # e, edit <commit> = use commit, but stop for amending 11 # s, squash <commit> = use commit, but meld into previous commit 12 # f, fixup <commit> = like "squash", but discard this commit's log message 13 # x, exec <command> = run command (the rest of the line) using shell 14 # b, break = stop here (continue rebase later with 'git rebase --continue') 15 # d, drop <commit> = remove commit 16 # l, label <label> = label current HEAD with a name 17 # t, reset <label> = reset HEAD to a label
- 59. 4a14d7b Add bar c296093 Add foo
- 60. @joelchippindale Make your progress clear by rewriting your history to tell a simple story
- 61. To recap the 5 practices 1. Plan your commits 2. Use single purpose branches 3. Make atomic commits 4. Write good commit messages 5. Rewrite your history to tell a story (early and often)
- 62. git cherry-pick git add --patch git rebase --interactive
- 63. @joelchippindale Following these 5 practices will free up your brain and help you break work into small steps
- 64. @joelchippindale As an added bonus...
- 65. @joelchippindale ...it can also provide valuable documentation for your code
- 66. “Every line of code is always documented” - Mislav Marohnić mislav.net/2014/02/hidden-documentation/
- 67. @joelchippindale Thank you Joel Chippindale - CTO at Unmade - @joelchippindale Thanks to my teams at Unmade, FutureLearn and Econsultancy who have all helped develop and refine these habits. Come and work with us at Unmade www.unmade.com/careers/
- 68. @joelchippindale Links for more info •A Branch in Time (a story about revision histories) •Every line of code is always documented •Telling stories with your Git history