[{"data":1,"prerenderedAt":210},["ShallowReactive",2],{"navigation":3,"talk-/talks/git-in-practice":146,"person-Lizzie Salmon":196,"/talks/git-in-practice-surround":205},[4],{"title":5,"path":6,"stem":7,"children":8,"page":145},"Talks","/talks","talks",[9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141],{"title":10,"path":11,"stem":12},"The Single Responsibility Principle","/talks/single-responsibility-principle","talks/single-responsibility-principle",{"title":14,"path":15,"stem":16},"The Open/Closed Principle","/talks/open-closed-principle","talks/open-closed-principle",{"title":18,"path":19,"stem":20},"Spack","/talks/spack","talks/spack",{"title":22,"path":23,"stem":24},"GitHub Actions","/talks/github-actions","talks/github-actions",{"title":26,"path":27,"stem":28},"Inheritance is Evil","/talks/inheritance-is-evil","talks/inheritance-is-evil",{"title":30,"path":31,"stem":32},"Nuxt","/talks/nuxt","talks/nuxt",{"title":34,"path":35,"stem":36},"LogSeq","/talks/logseq","talks/logseq",{"title":38,"path":39,"stem":40},"Time Complexity","/talks/time-complexity","talks/time-complexity",{"title":42,"path":43,"stem":44},"How to Review a Codebase","/talks/how-to-review-a-codebase","talks/how-to-review-a-codebase",{"title":46,"path":47,"stem":48},"Numba and Bitmasks","/talks/numba-and-bitmasks","talks/numba-and-bitmasks",{"title":50,"path":51,"stem":52},"Mutation Testing","/talks/mutation-testing","talks/mutation-testing",{"title":54,"path":55,"stem":56},"Message Passing Interface","/talks/message-passing-interface","talks/message-passing-interface",{"title":58,"path":59,"stem":60},"P vs NP","/talks/p-vs-np","talks/p-vs-np",{"title":62,"path":63,"stem":64},"Verbose Graphics with Rust and Vulkan","/talks/verbose-graphics-with-rust-and-vulkan","talks/verbose-graphics-with-rust-and-vulkan",{"title":66,"path":67,"stem":68},"Slidev","/talks/slidev","talks/slidev",{"title":70,"path":71,"stem":72},"Nuxt Content By Example","/talks/nuxt-content-by-example","talks/nuxt-content-by-example",{"title":74,"path":75,"stem":76},"Rust MMU Guest Lecture","/talks/rust-mmu-guest-lecture","talks/rust-mmu-guest-lecture",{"title":78,"path":79,"stem":80},"As We May Think - AI for Coding","/talks/ai-for-coding","talks/ai-for-coding",{"title":82,"path":83,"stem":84},"Git in Practice: Techniques for Collaborative Development","/talks/git-in-practice","talks/git-in-practice",{"title":86,"path":87,"stem":88},"A Crash Course in Natural Language Processing","/talks/natural-language-processing","talks/natural-language-processing",{"title":90,"path":91,"stem":92},"Graphs: Ruining the Travelling Salesman's Day Since 1930","/talks/graph-theory","talks/graph-theory",{"title":94,"path":95,"stem":96},"Automating File Creation With Jinja2 Templates in Python","/talks/jinja2-templates-with-python","talks/jinja2-templates-with-python",{"title":98,"path":99,"stem":100},"What the hell is a Monad?","/talks/monads","talks/monads",{"title":102,"path":103,"stem":104},"The Liskov Substitution Principle","/talks/liskov-substitution-principle","talks/liskov-substitution-principle",{"title":106,"path":107,"stem":108},"Everything as a Specification","/talks/everything-as-a-specification","talks/everything-as-a-specification",{"title":110,"path":111,"stem":112},"The Interface Segregation Principle","/talks/interface-segregation-principle","talks/interface-segregation-principle",{"title":114,"path":115,"stem":116},"The Dependency Inversion Principle","/talks/dependency-inversion-principle","talks/dependency-inversion-principle",{"title":118,"path":119,"stem":120},"A Field Guide To Coupling","/talks/a-field-guide-to-coupling","talks/a-field-guide-to-coupling",{"title":122,"path":123,"stem":124},"Why Python is (and isn't) Fast","/talks/why-python-is-slow","talks/why-python-is-slow",{"title":126,"path":127,"stem":128},"Cybersecurity","/talks/cybersecurity","talks/cybersecurity",{"title":130,"path":131,"stem":132},"What Linux Distribution Should You Use?","/talks/what-linux-distribution","talks/what-linux-distribution",{"title":134,"path":135,"stem":136},"Agent Communication Protocols","/talks/agent-communication-protocols","talks/agent-communication-protocols",{"title":138,"path":139,"stem":140},"Why I hate try/catch, and why you should hate it too!","/talks/hate-try-catch","talks/hate-try-catch",{"title":142,"path":143,"stem":144},"The Beauty of Vim Motions","/talks/beauty-of-vim-motions","talks/beauty-of-vim-motions",false,{"id":147,"title":82,"body":148,"date":185,"description":186,"extension":187,"imgClass":188,"imgUrl":189,"isImgLogo":190,"meta":191,"navigation":190,"path":83,"recordingUrl":192,"seo":193,"speaker":194,"stem":84,"__hash__":195},"talks/talks/git-in-practice.md",{"type":149,"value":150,"toc":180},"minimark",[151,155,158],[152,153,154],"p",{},"This session will go beyond the simple pull-commit-push workflow and explore practical techniques for maintaining clean, reliable version histories in multi-developer environments.",[152,156,157],{},"Material to be covered:",[159,160,161,165,168,171,174,177],"ul",{},[162,163,164],"li",{},"Collaborating with Git: How Git supports teamwork and version control in modern development, with examples of effective branching strategies and workflows.",[162,166,167],{},"Branching and merging strategies: Understanding feature branches, Git workflows, and trunk-based development to manage change efficiently.",[162,169,170],{},"Advanced Git commands: Practical use of git rebase, git merge, git reset, git bisect, and git cherry-pick. Discussing when and how to use them safely to simplify history and resolve issues.",[162,172,173],{},"Conflict resolution: Techniques for diagnosing and resolving merge conflicts cleanly and confidently.",[162,175,176],{},"Git hooks and CI/CD integration: Leveraging Git hooks to automate quality checks, enforce standards, and integrate testing into CI/CD pipelines.",[162,178,179],{},"Merge requests and code reviews: Best practices for creating, reviewing, and approving merge requests, and giving constructive feedback to maintain high code quality and consistency.",{"title":181,"searchDepth":182,"depth":183,"links":184},"",1,2,[],["Date","2026-03-04T00:00:00.000Z"],"This lecture will focus on Git good practices and advanced commands to help developers work more efficiently and collaboratively in shared repositories.","md","bg-white","/images/git.png",true,{},"https://stfc365-my.sharepoint.com/personal/ashraf_hussain_stfc_ac_uk/_layouts/15/embed.aspx?UniqueId=f5bb405d-2fb2-44a1-a6d2-b17d8da1d3d8&embed=%7B%22ust%22%3Afalse%2C%22hv%22%3A%22CopyEmbedCode%22%7D&referrer=StreamWebApp&referrerScenario=EmbedDialog.Create",{"title":82,"description":186},"Lizzie Salmon","vjB71psj4QKBDym6Y2Y3X6hYiUBQP_659trqLUgk24Q",{"id":197,"title":198,"extension":199,"imgUrl":200,"meta":201,"name":194,"roles":202,"stem":203,"__hash__":204},"people/people/lizzie-salmon.yml","Research Software Engineer","yml","/images/people/lizzie-salmon.jpg",{},null,"people/lizzie-salmon","Tdw7h-nnlSBlQkMnzWfJ7QVBp3Py9utAeoxGny4T2Ek",[206,208],{"title":78,"path":79,"stem":80,"description":207,"children":-1},"A discussion of agentic coding tools, including what they are, how they can be used effectively, and how they fit into the history of human-computer interaction",{"title":86,"path":87,"stem":88,"description":209,"children":-1},"An introduction to Natural Language Processing (NLP), covering techniques, jargon and use cases.",1778147360918]