From 5bcf4bea21124d8dddd389536ac6d60b22fd6751 Mon Sep 17 00:00:00 2001
From: mallurivikas <vikasmalluri@gmail.com>
Date: Thu, 2 Oct 2025 20:09:06 +0530
Subject: [PATCH 1/2] Added blog post: How I Tried Resolving Merge Conflict
 Today

---
 .../blog/resolving-merge-conflicts-vikas.md   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 content/en/blog/resolving-merge-conflicts-vikas.md

diff --git a/content/en/blog/resolving-merge-conflicts-vikas.md b/content/en/blog/resolving-merge-conflicts-vikas.md
new file mode 100644
index 0000000..6ea84e3
--- /dev/null
+++ b/content/en/blog/resolving-merge-conflicts-vikas.md
@@ -0,0 +1,49 @@
+---
+title: "How I Resolve Merge Conflicts Easily"
+author: "Vikas"
+date: 2025-10-02
+tags: ["git", "merge", "conflict"]
+---
+
+# How I Resolve Merge Conflicts Easily
+
+Merge conflicts happen when Git can’t automatically combine changes from different people. It’s not scary — it just means Git needs you to decide which changes to keep.
+
+---
+
+## Steps I Follow to Resolve Conflicts
+
+1. **Check the conflicted files**  
+   Git will tell you which files have conflicts after a merge or pull.
+
+2. **Open the files and look for conflict markers**  
+   You’ll see things like `<<<<<<< HEAD`, `=======`, and `>>>>>>> branch-name`.
+
+3. **Decide which changes to keep**  
+   You can keep your changes, the other person’s changes, or combine both.
+
+4. **Remove the conflict markers**  
+   Make sure the file looks exactly how you want it after merging.
+
+5. **Save the file**  
+   Confirm that it works and nothing is broken.
+
+6. **Stage the resolved files**  
+   ```bash
+   git add <file-name>
+
+7. **Commit the merge**
+git commit
+
+8. **Continue working normally**
+Pull, push, or merge as usual.
+
+Quick Tips
+Communicate with teammates if unsure which changes to keep.
+Keep commits small and pull often — fewer conflicts that way.
+Don’t panic — conflicts are just Git asking for guidance.
+
+Resolving merge conflicts is easy once you know the steps. Follow them carefully, and Git will never feel intimidating again.
+
+Happy Coding!!
+-Vikas :)
\ No newline at end of file

From f966ee48a7bc92620d227b3198e5a03ef752e0b0 Mon Sep 17 00:00:00 2001
From: Malluri Vikas <139904942+mallurivikas@users.noreply.github.com>
Date: Fri, 3 Oct 2025 12:11:01 +0530
Subject: [PATCH 2/2] Update content/en/blog/resolving-merge-conflicts-vikas.md

Co-authored-by: Ayush Chauhan <56398566+bakayu@users.noreply.github.com>
---
 content/en/blog/resolving-merge-conflicts-vikas.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/en/blog/resolving-merge-conflicts-vikas.md b/content/en/blog/resolving-merge-conflicts-vikas.md
index 6ea84e3..354b9b6 100644
--- a/content/en/blog/resolving-merge-conflicts-vikas.md
+++ b/content/en/blog/resolving-merge-conflicts-vikas.md
@@ -1,5 +1,6 @@
 ---
 title: "How I Resolve Merge Conflicts Easily"
+linkTitle: "Resolving Merge Conflicts"
 author: "Vikas"
 date: 2025-10-02
 tags: ["git", "merge", "conflict"]