using git for my benefit while learning and experimenting, not only for building, made me discover that frequent commits help (should have known). i do follow branching/rebase tips. commit on per file basis usually suits me. such as 'wip: hooks/useSearchEvents: add loading state'