---
title: "Discussion on \"What are merge conflicts in Git and how to resolve them?\" | Hashnode"
description: "Discussion on \"What are merge conflicts in Git and how to resolve them?\". Trust me, it's easy 😃"
url: "https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784"
---

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

Discussion

# [What are merge conflicts in Git and how to resolve them?](https://jpv-1649076767739.hashnode.dev/what-are-merge-conflicts-in-git-and-how-to-resolve-them?utm_source=hashnode&utm_medium=feed)

Trust me, it's easy 😃

Nov 11, 2022 · 4 min read · jpv-1649076767739.hashnode.dev  
Read the article

-   [#git](https://hashnode.com/tag/git)
-   [#github](https://hashnode.com/tag/github)
-   [#version-control](https://hashnode.com/tag/version-control)
-   [#javascript](https://hashnode.com/tag/javascript)
-   [#web-development](https://hashnode.com/tag/web-development)

## Written by

[Usman Sabuwala](https://hashnode.com/@usmanwrites)

@usmanwrites · India

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

Learning web development, running a YouTube channel

I am a full stack developer, YouTuber and blogger!

## Responses 6

Markdown supported · ⌘↵ to post

[Vikalp Tomer](https://hashnode.com/@vikalp)

[Dec 19, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/63a07c9fa59cad9bdbb9f36e)

Which app do you use to record these small beautiful compressed gifs/video recording of your computer screen.

[Usman Sabuwala](https://hashnode.com/@usmanwrites)

[Dec 19, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/63a07c9fa59cad9bdbb9f36e#reply-63a085f1a59cad9bdbb9f56b)

In this case, I used an app called Peek. It's available for Linux.

If you use Windows, then download ScreenToGif

[Vikalp Tomer](https://hashnode.com/@vikalp)

[Dec 19, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/63a07c9fa59cad9bdbb9f36e#reply-63a08bceaafcb79c00aa9a9d)

[Usman Sabuwala](https://hashnode.com/@usmanwrites) thanks

[partha narra](https://hashnode.com/@ParthaNarra)

[Nov 17, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/6375b69b6b5b36690fac8d3f)

Great Explanation

[Shubham Kumar Singh](https://hashnode.com/@shubhamsinghbundela)

[Nov 16, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/6374afdde1d53a5fd290dcaa)

Thank you [Usman Sabuwala](https://hashnode.com/@usmanwrites)

[Usman Sabuwala](https://hashnode.com/@usmanwrites)

[Nov 16, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/6374afdde1d53a5fd290dcaa#reply-6374c8f9e1d53a5fd290df0a)

You're welcome 🙂

[Usman Khimani09](https://hashnode.com/@usmankhimani)

[Nov 13, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/6370ae12c83b2a23bd2bc7a0)

Mashallah❤

[Muzzammil](https://hashnode.com/@humblemuzzu)

[Nov 13, 2022](https://hashnode.com/posts/what-are-merge-conflicts-in-git-and-how-to-resolve-them/636e7ac50a6478fcd6e30784/comment/6370aadb156201257c94655d)

Great Article 👌
