Skip to content
  • Home
  • About
  • No Access
  • Privacy Policy
Bits of .NET
Bits of .NET
  • Asp.Net Core
  • C#
  • SQL
  • JavaScript
  • CSS
  • About
  • ErcanOPAK.com
  • No Access
  • Privacy Policy

Bits of .NET

Daily micro-tips for C#, SQL, performance, and scalable backend engineering.

  • Asp.Net Core
  • C#
  • SQL
  • JavaScript
  • CSS
  • About
  • ErcanOPAK.com
  • No Access
  • Privacy Policy
Git

Git: Resolving Merge Conflicts Like a Pro

- 15.08.26 - ErcanOPAK

🔀 Merge Conflict Resolution = Git Mastery

Merge conflicts are inevitable. Mastering conflict resolution makes you a Git expert.

📝 Conflict Resolution Workflow

# 1. Identify Conflicts
git status
# both modified: src/App.js

# 2. View Changes
git diff
git diff --name-only --diff-filter=U

# 3. Resolve Conflicts
# Open file and look for:
<<<<<<< HEAD
// Your changes
const user = getUserById(id);
=======
// Incoming changes
const user = await getUserById(id);
>>>>>>> feature-branch

# 4. Mark Resolved
git add src/App.js

# 5. Commit Merge
git commit -m "Resolved merge conflicts"

# 6. Abort Merge
git merge --abort

# 7. Use --theirs or --ours
git checkout --theirs src/App.js
git checkout --ours src/App.js

🎯 Advanced Tools

# Visual Merge Tools
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'
git mergetool

# Three-Way Merge
git merge --no-ff --no-commit feature-branch

# Rebase Instead
git checkout feature-branch
git rebase main
git rebase --continue
git rebase --abort

# Interactive Rebase
git rebase -i HEAD~5

# Cherry-pick
git checkout main
git cherry-pick abc123

# Stash Before Merge
git stash save "WIP before merge"
git pull origin main
git stash pop

💡 Conflict Prevention Tips

  • Pull and merge frequently
  • Communicate about overlapping work
  • Keep branches short-lived
  • Use feature flags
  • Review code with conflict resolution in mind

Merge conflicts are not failures—they’re opportunities to improve collaboration and code quality.

— Git Expert

Related posts:

Git: Fix a Stash Pop Conflicting With Unrelated Untracked Files

Git: Fix a Stash Pop Conflicting With Unrelated Untracked Files

Git: Use Git Remote to Connect to GitHub, GitLab, Bitbucket

Git: Use Git Remote to Connect to GitHub, GitLab, Bitbucket

Git History Looks Clean but Bugs Exist

Git History Looks Clean but Bugs Exist

Views: 9

Post navigation

AJAX: REST API Documentation with OpenAPI
.NET Core: Implementing Mediator Pattern with DI

Leave a Reply Cancel reply

Your email address will not be published. Required fields are marked *

November 2026
M T W T F S S
 1
2345678
9101112131415
16171819202122
23242526272829
30  
« Oct    

Most Viewed Posts

  • How to make theater mode the default for Youtube (1,068)
  • Get the User Name and Domain Name from an Email Address in SQL (990)
  • How to add default value for Entity Framework migrations for DateTime and Bool (986)
  • Get the First and Last Word from a String or Sentence in SQL (865)
  • How to select distinct rows in a datatable in C# (859)
  • How to enable, disable and check if Service Broker is enabled on a database in SQL Server (661)
  • Add Constraint to SQL Table to ensure email contains @ (619)
  • Average of all values in a column that are not zero in SQL (577)
  • How to use Map Mode for Vertical Scroll Mode in Visual Studio (553)
  • Find numbers with more than two decimal places in SQL (481)

Recent Posts

  • Network Speed Monitor Windows Application v2.5.1
  • Ağ Hızı İzleyici Windows Uygulaması v2.5.1
  • How to make theater mode the default for Youtube
  • The AI Prompt That Audits a Function for Thread-Safety Gaps
  • Ajax: Fix a Fetch Request Caching a Response Despite No-Store
  • WordPress: Fix a Navigation Block Losing Submenu Items After Sync
  • Visual Studio: Fix CodeLens Reference Counts Stuck at Stale Numbers
  • C#: Fix a UTF-8 String Literal Behaving Differently in a Switch
  • Photoshop: Fix a Liquify Mesh Snapping Back on a Smart Object
  • The AI Prompt That Turns a Crash Dump Into a Short Repro Script

Most Viewed Posts

  • How to make theater mode the default for Youtube (1,068)
  • Get the User Name and Domain Name from an Email Address in SQL (990)
  • How to add default value for Entity Framework migrations for DateTime and Bool (986)
  • Get the First and Last Word from a String or Sentence in SQL (865)
  • How to select distinct rows in a datatable in C# (859)

Recent Posts

  • Network Speed Monitor Windows Application v2.5.1
  • Ağ Hızı İzleyici Windows Uygulaması v2.5.1
  • How to make theater mode the default for Youtube
  • The AI Prompt That Audits a Function for Thread-Safety Gaps
  • Ajax: Fix a Fetch Request Caching a Response Despite No-Store

Social

  • ErcanOPAK.com
  • GoodReads
  • LetterBoxD
  • Linkedin
  • The Blog
  • Twitter
© 2026 Bits of .NET | Built with Xblog Plus free WordPress theme by wpthemespace.com