---
title: "Discussion on \"Can You Resolve Merge Conflicts Before They Happen?\" | Hashnode"
description: "Discussion on \"Can You Resolve Merge Conflicts Before They Happen?\". olving merge conflicts is fun! - said no one ever. Nobody likes them, but it doesn’t change the fact that they are, well, part of the job."
url: "https://hashnode.com/posts/can-you-resolve-merge-conflicts-before-they-happen/628caaa4b4bd016fc9a308ab"
---

[Feed](https://hashnode.com/feed) /

Discussion

# [Can You Resolve Merge Conflicts Before They Happen?](https://bensblog.hashnode.dev/can-you-resolve-merge-conflicts-before-they-happen?utm_source=hashnode&utm_medium=feed)

olving merge conflicts is fun! - said no one ever. Nobody likes them, but it doesn’t change the fact that they are, well, part of the job.

May 24, 2022 · 3 min read · bensblog.hashnode.dev  
Read the article

-   [#programming](https://hashnode.com/tag/programming)
-   [#git](https://hashnode.com/tag/git)
-   [#software-development](https://hashnode.com/tag/software-development)
-   [#developer](https://hashnode.com/tag/developer)
-   [#tutorial](https://hashnode.com/tag/tutorial)

## Written by

[Benjamin C. Baker](https://hashnode.com/@benjamincbaker)

@benjamincbaker

  
[View profile](https://hashnode.com/@benjamincbaker)

Avid Coder & Culinary Enthusiast

## Responses 2

Markdown supported · ⌘↵ to post

[Saikat Roy](https://hashnode.com/@njmsaikat)

[May 29, 2022](https://hashnode.com/posts/can-you-resolve-merge-conflicts-before-they-happen/628caaa4b4bd016fc9a308ab/comment/62930ba70989e6b52feb08c8)

Thanks for sharing some of the tricks to avoid regular this regular problem.

[Markos Korvesis](https://hashnode.com/@MarkosK)

[May 25, 2022](https://hashnode.com/posts/can-you-resolve-merge-conflicts-before-they-happen/628caaa4b4bd016fc9a308ab/comment/628dca4ebc26026fa45c5d7c)

Great post, [Benjamin C. Baker](https://hashnode.com/@benjamincbaker), kudos! 👏

Especially, the suggestion for the GitLive plugin is ![Legendary](https://media.giphy.com/media/12slK3kRc9ps08/giphy.gif)

[Benjamin C. Baker](https://hashnode.com/@benjamincbaker)

[May 25, 2022](https://hashnode.com/posts/can-you-resolve-merge-conflicts-before-they-happen/628caaa4b4bd016fc9a308ab/comment/628dca4ebc26026fa45c5d7c#reply-628decbf19bda58ac7fb05b5)

Haha, thank you!!!