---
title: "Discussion on \"How Do I Resolve Merge Conflicts?\" | Hashnode"
description: "Discussion on \"How Do I Resolve Merge Conflicts?\". I don’t think I’m alone in saying this; early in my career, merge conflicts were the bane of my existence (particularly in 2019). I graduated from a coding boot camp in 2018, and during that time, if I ever experienced a git issue that I didn’t know ..."
url: "https://hashnode.com/posts/how-do-i-resolve-merge-conflicts/6235f8568e4fae3f767dd767"
---

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

Discussion

# [How Do I Resolve Merge Conflicts?](https://blackgirlbytes.dev/how-do-i-resolve-merge-conflicts?utm_source=hashnode&utm_medium=feed)

I don’t think I’m alone in saying this; early in my career, merge conflicts were the bane of my existence (particularly in 2019). I graduated from a coding boot camp in 2018, and during that time, if I ever experienced a git issue that I didn’t know ...

Mar 19, 2022 · 6 min read · blackgirlbytes.dev  
Read the article

-   [#github](https://hashnode.com/tag/github)
-   [#git](https://hashnode.com/tag/git)

## Written by

[Rizel Scarlett](https://hashnode.com/@blackgirlbytes)

@blackgirlbytes

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

Staff Developer Advocate @ TBD

Developer Advocate @ GitHub

## Responses 1

Markdown supported · ⌘↵ to post

[Edwin Valerio](https://hashnode.com/@EdwinValerio)

[Dec 20, 2022](https://hashnode.com/posts/how-do-i-resolve-merge-conflicts/6235f8568e4fae3f767dd767/comment/63a1e2f8a59cad9bdbba2e3c)

thank you Rizel Scarlett for this!! keep up the good work