https://datatweets.com/courses/git-and-github/branching-and-merging/Recent content in Branching and Merging on DATATWEETSHugoenCopyright (c) 2025 DatatweetsSun, 28 Jun 2026 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-1-branches-explained/Fri, 14 Nov 2025 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-1-branches-explained/A branch is just a lightweight, movable pointer to a commit. Learn to list branches, create and switch with git switch, see how commits move a branch forward, and watch branches diverge in the history graph.https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-2-merging/Fri, 14 Nov 2025 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-2-merging/Combine branches with git merge. Learn when Git fast-forwards versus creating a three-way merge commit, force a merge commit with –no-ff, read the result in git log –graph, and delete merged branches.https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-3-merge-conflicts/Fri, 14 Nov 2025 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-3-merge-conflicts/Conflicts are normal and recoverable. See when they happen, read git status and the «««< / ======= / »»»> markers, resolve by editing and committing, and bail out safely with git merge –abort.https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-4-stashing/Fri, 14 Nov 2025 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-4-stashing/Need a clean working tree but aren’t ready to commit? git stash shelves your changes, git stash list shows them, and git stash pop restores them — perfect for handling an urgent interruption.https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-5-guided-project-two-features-one-conflict/Fri, 14 Nov 2025 09:00:00 +0200https://datatweets.com/courses/git-and-github/branching-and-merging/lesson-5-guided-project-two-features-one-conflict/Put branching and merging together: build two SkyLog features on their own branches, merge the first cleanly, hit and resolve a real merge conflict on the second by combining both changes, and end with a clean merged history.