---
title: "Discussion on \"How Does Merging Code Actually Work? Branches, Conflicts, and Pull Requests\" | Hashnode"
description: "Discussion on \"How Does Merging Code Actually Work? Branches, Conflicts, and Pull Requests\". Two people changed the same file — here is what happens next, and why it is not scary"
url: "https://hashnode.com/posts/how-does-merging-code-actually-work-branches-conflicts-and-pull-requests/6af5179500ec84dbbcd30bf4"
---

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

Discussion

# [How Does Merging Code Actually Work? Branches, Conflicts, and Pull Requests](https://itsmeminsithu.hashnode.dev/how-does-merging-code-actually-work-branches-conflicts-and-pull-requests?utm_source=hashnode&utm_medium=feed)

Two people changed the same file — here is what happens next, and why it is not scary

3d ago · 6 min read · itsmeminsithu.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)
-   [#collaboration](https://hashnode.com/tag/collaboration)
-   [#beginners](https://hashnode.com/tag/beginners)

## Written by

[Min SiThu](https://hashnode.com/@itsmeminsithu)

@itsmeminsithu · Singapore

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

Software Engineer

Nubbad Developer. | Now I accidentally create problems.

## Responses

Markdown supported · ⌘↵ to post

No responses yet.