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: Use Git Merge to Combine Branches

- 21.06.26 - ErcanOPAK

🔀 Merge = Combine Changes

Branches diverge. git merge brings them together. Feature branch to main, bug fixes to release. Essential for collaboration.

📝 Basic Merge

# Switch to target branch
git checkout main

# Update main (pull latest)
git pull origin main

# Merge feature branch
git merge feature-branch

# Resolve conflicts (if any)
# Edit files, git add, git commit

# Push merged changes
git push origin main

🎯 Merge Types

# Fast-forward merge (no merge commit)
git merge --ff-only feature-branch

# Create merge commit (always)
git merge --no-ff feature-branch

# Squash merge (one commit)
git merge --squash feature-branch

# Abort merge
git merge --abort

# Merge with commit message
git merge feature-branch -m "Merge feature-branch into main"

# Merge only specific files
git checkout feature-branch -- file1.txt file2.txt

💡 Merge Conflicts

  • Conflicts occur when same file changed differently
  • Edit conflict markers (<<<<<<, =======, >>>>>>>)
  • git add resolved files
  • git merge –continue
  • git merge –abort to cancel

“Merge brings branches together. Essential for team collaboration. Learn merge conflicts — they happen often.”

— Git User

Related posts:

Git: Use git commit --amend to Fix Last Commit Without New Commit

Git: Use git commit --amend to Fix Last Commit Without New Commit

Git: Fix git clean -fd Deleting a Build Output Folder You Meant to Protect Because the .gitignore Pa...

Git: Fix git clean -fd Deleting a Build Output Folder You Meant to Protect Because the .gitignore Pa...

Git: Fix a Commit History Where the Author Date Is Right but the Committer Date Gives Away the Real ...

Git: Fix a Commit History Where the Author Date Is Right but the Committer Date Gives Away the Real ...

Views: 15

Post navigation

Ajax: Read Response Headers from Fetch
.NET Core: Use Authorization for Access Control

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