Skip to content

krittikabiswas/Conflict-Playground

Folders and files

NameName
Last commit message
Last commit date

Latest commit

Β 

History

19 Commits
Β 
Β 
Β 
Β 
Β 
Β 
Β 
Β 
Β 
Β 
Β 
Β 

Repository files navigation

🌟 Another Git Fly β€” Merge Conflict Exploration πŸ™βœ¨

πŸš€ About This Repo 🧩

This repo is a small hands-on experiment on a random Sunday morning in my hostel room where I explored how Git reacts when two branches modify the same file differently. 🫢

I intentionally created merge conflicts to understand how to fix them cleanly 🧹 and manage branches with clarity and confidence 🌱.

What I Did ActuallyπŸ’ͺπŸ’ͺ

  • 🌿 Created and switched between branches
  • ✏️ Made different edits to the same file
  • πŸ’₯ Triggered merge conflicts
  • πŸͺ„ Resolved them manually
  • πŸ”— Merged everything cleanly

Skills PracticedπŸ’…πŸ’…

  • 🌱 Git branching
  • πŸ“¬ Pull requests
  • πŸ› οΈ Conflict resolution
  • 🧼 Clean version management

Final Note✨✨

A tiny experiment but a surprisingly insightful one.. hehe, at least I am happyyyyy πŸ˜­πŸ’›
More Git explorations gonna be doing πŸ€ŒπŸš€

About

A lightweight exploration into Resolve-merge-conflicts, branch handling, and version flow ✨ Featuring hands-on experiments with 🌿 branch variations, πŸ’₯ conflicting edits, πŸ› οΈ manual conflict fixing, and πŸ”— clean merges β€” all designed to understand how Git behaves when things get messy, and how to bring everything back together smoothly πŸ™πŸ’›

Topics

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors