--- title: "#gitmerge articles | Hashnode" description: "Explore 8 articles tagged #gitmerge on Hashnode. Tutorials, guides, and how-tos from the community." url: "https://hashnode.com/tag/gitmerge" --- Tag # #gitmerge 8 posts · 0 followers [Sohaib Ilyas](https://hashnode.com/@sohaibilyas) · [Jun 18, 2025](https://hashnode.com/posts/resolve-git-merge-conflicts-easy-tips-and-best-practices/68532816e34f75a15455d1e4) ### [Resolve Git Merge Conflicts: Easy Tips & Best Practices](https://sohaibilyas.com/resolve-git-merge-conflicts-easy-tips-and-best-practices?utm_source=hashnode&utm_medium=feed) Learn how to resolve git merge conflicts efficiently with our expert tips. Master this essential skill to keep your code clean and collaboration smooth. 22 min read · [sohaibilyas.com](https://sohaibilyas.com/resolve-git-merge-conflicts-easy-tips-and-best-practices?utm_source=hashnode&utm_medium=feed) [isiagi geofrey](https://hashnode.com/@isiagi) · [Jul 19, 2024](https://hashnode.com/posts/how-to-fix-git-merge-conflicts-with-github-interface/6699d85b5c98bf29e64caead) ### [How To Fix Git Merge Conflicts With Github Interface.](https://isiagi.hashnode.dev/how-to-fix-git-merge-conflicts-with-github-interface?utm_source=hashnode&utm_medium=feed) Summary This article covers handling Git merge conflicts by creating conflicts between branches and resolving them. You'll learn to create a conflict by making diverging changes in a new branch (dev) and the master branch. The steps include: initial... 6 min read · [isiagi.hashnode.dev](https://isiagi.hashnode.dev/how-to-fix-git-merge-conflicts-with-github-interface?utm_source=hashnode&utm_medium=feed) [Mikey Nichols](https://hashnode.com/@mNix) · [Apr 21, 2024](https://hashnode.com/posts/branching-and-merging-strategies/67feffcb8d081418fb2df097) ### [Branching and Merging Strategies](https://journeytocode.hashnode.dev/branching-and-merging-strategies?utm_source=hashnode&utm_medium=feed) Work in Parallel, Then Bring It Back 13 min read · [journeytocode.hashnode.dev](https://journeytocode.hashnode.dev/branching-and-merging-strategies?utm_source=hashnode&utm_medium=feed) [Nilkanth Mistry](https://hashnode.com/@Nilkanth1010) · [Feb 7, 2024](https://hashnode.com/posts/day-10-mastering-advanced-git-github/65c3a4506a1fce202275238e) ### [Day 10 - Mastering Advanced Git & GitHub 🌟](https://nilkanthmistrydevops.dev/day-10-mastering-advanced-git-github?utm_source=hashnode&utm_medium=feed) Navigating Git Branches 🌲🚀 Understanding Branches 🤔🌿 Branches in Git are like different storylines in your coding adventure. Each branch lets you develop features or fix bugs without disturbing the main storyline. Think of it as a playground for... 1 min read · [nilkanthmistrydevops.dev](https://nilkanthmistrydevops.dev/day-10-mastering-advanced-git-github?utm_source=hashnode&utm_medium=feed) [1](https://hashnode.com/posts/day-10-mastering-advanced-git-github/65c3a4506a1fce202275238e) [vaheeda begum sheik](https://hashnode.com/@vaheeda) · [Sep 1, 2023](https://hashnode.com/posts/git-and-git-commands/64f19f9a4570446d0c5c4282) ### [Git and git commands](https://vaheedas.hashnode.dev/git-and-git-commands?utm_source=hashnode&utm_medium=feed) What are git and git advantages and commands their uses? #devopsjourney #devopscommunity #devopstools #devopsenginee #gitcommands #git GIT Git is a distributed version control system that allows multiple people to collaborate on a project while keep... 5 min read · [vaheedas.hashnode.dev](https://vaheedas.hashnode.dev/git-and-git-commands?utm_source=hashnode&utm_medium=feed) [Ayushi Vasishtha](https://hashnode.com/@AyushiVasishtha15) · [Jul 29, 2023](https://hashnode.com/posts/advance-git-github-for-devops-engineers/64c511c0ea70343fdcf60909) ### [Advance Git & GitHub for DevOps Engineers](https://ayushi1503.hashnode.dev/advance-git-github-for-devops-engineers?utm_source=hashnode&utm_medium=feed) 🔀Git Branching: Git branching is a powerful feature of the Git version control system that allows developers to create separate lines of development, known as branches, from the main codebase. Each branch operates independently, enabling developers ... 7 min read · [ayushi1503.hashnode.dev](https://ayushi1503.hashnode.dev/advance-git-github-for-devops-engineers?utm_source=hashnode&utm_medium=feed) [Namrata Kumari](https://hashnode.com/@NamG) · [Jul 29, 2023](https://hashnode.com/posts/git-stashcherry-pickmerge-conflicts-day11-of-90daysofdevops/64c495395739c80d502f2a48) ### [Git Stash/Cherry-pick/Merge Conflicts: #Day11 of 90DaysofDevOps](https://namrata.dev/90daysofdevops/git-stashcherry-pickmerge-conflicts-day11-of-90daysofdevops?utm_source=hashnode&utm_medium=feed) Advance Git & GitHub for DevOps Engineers: Part-2 4 min read · [namrata.dev](https://namrata.dev/90daysofdevops/git-stashcherry-pickmerge-conflicts-day11-of-90daysofdevops?utm_source=hashnode&utm_medium=feed) [Biswaraj Sahoo](https://hashnode.com/@Biswaraj333) · [Jun 20, 2023](https://hashnode.com/posts/git-rebase-vs-merge-a-complete-guide/6491259a96e9ebe0220c00b8) ### [Git Rebase vs. Merge: A Complete Guide](https://biswaraj333.hashnode.dev/git-rebase-vs-merge-a-complete-guide?utm_source=hashnode&utm_medium=feed) TABLE OF CONTENTS What Is Git Rebase? What Is Git Merge? The Workings of Git Rebase and Merge Git Rebase and Git Merge Similarities What’s the Difference Between Merge and Rebase? Git Rebase vs. Merge Strategies How Do You Use Git Rebase and G... 3 min read · [biswaraj333.hashnode.dev](https://biswaraj333.hashnode.dev/git-rebase-vs-merge-a-complete-guide?utm_source=hashnode&utm_medium=feed)