https://diode.zone/videos/watch/209d71be-d807-493d-b4dc-2889a86cded7 Will discuss which git workflow to use for your needs, how to write commit messages, how to rewrite history, when to use rebase and merge, which git client is better for you. 0:00 Greetings 0:50 Introduction 1:47 Requirements for the workflow 4:32 Git workflows overview 6:25 Git Flow 8:37 GitHub Flow 10:55 Simple Git Workflow 16:12 GitLab Flow 18:06 Demo 19:10 git log, blame, timemachine 21:56 stash, unstaged, staged/index 23:57 new feature branch 24:18 commit, amend 30:05 push origin/remote 30:37 PR, review, team interaction 37:00 Interactive rebase -i, history rewrite 43:18 soft reset during rebase 51:37 Test and deploy to stage before merge 59:43 Comparing with jekyll git history 1:02:27 Question Which client to use? Top 3 magit feature How to merge? Why atomic commits instead of huge? sample workflow: https://github.com/abcdw/configs/blob/master/stale/gitstory.org slides: https://abcdw.github.io/talks/06git_workflows sample repo: https://github.com/abcdw/git-workflow-example Our today guest: Leonid Melnik Tue, 20 Oct 2026 16:39:21 GMT https://validator.w3.org/feed/docs/rss2.html PeerTube - https://diode.zone https://diode.zone/lazy-static/avatars/61b689b7-84d5-43c7-9fa8-e63a7fd1d952.png https://diode.zone/videos/watch/209d71be-d807-493d-b4dc-2889a86cded7 All rights reserved, unless otherwise specified in the terms specified at https://diode.zone/about and potential licenses granted by each content's rightholder.