GIT: Conflict Resolve 3 Ways


🧠 Problem Scenario:
User A and User B both change the same file
User B pushes to main first ✅
User A did not pull latest main before pushing ❌
❗️Conflict occurs when A tries to push
🛠️ Way 1: Manual Merge (Safe and Clear)
✅ Pull latest changes from main : git pull origin main
🧠 Manually resolve conflicts in files (look for <<<<<<< , ======= , >>>>>>> )
✅ Check status: git status
✅ Stage resolved files: git add .
✅ Commit the merge : commit -m "Resolved merge conflict manually"
✅ Push to your branch: git push origin your-branch-name
🧹 Way 2: Discard Your Changes & Start Fresh
Steps:
❌ Discard current changes (danger: will delete uncommitted changes!)
 git reset --hard HEAD
2.✅ Switch to main and pull latest:
 git checkout main,
 git pull origin main
3.✅ Switch back to your branch, re-do your changes:
git checkout your-branch-name
Make your changes again git status git add . git commit -m "Fresh changes after pulling main" git push origin your-branch-name
📦 Way 3: Use git stash (Save & Restore)
Steps:
📦 Save your current work:
 git stash
✅ Get latest main:
git checkout main git pull origin main
🧑‍💻 Switch back and restore changes:
git checkout your-branch-name git stash pop
✅ Add, commit, and push
 git add . git commit -m "Reapplied my changes on updated main" git push origin your-branch-name
Merge a Branch into main
git checkout main
git pull origin main
git merge feature-branch
git push origin main


Why we need three way 
Method Best For Pros Cons
Way 1 (Manual) Team merge situations Full control, preserves both sides Time-consuming
Way 2 (Reset) Quick cleanup or minor changes Clean start, simple Destroys uncommitted work
Way 3 (Stash) Smart sync without manual merge Saves time, keeps changes May still conflict if large change

Comments

Post a Comment

Popular posts from this blog

Spread and Rest

Image
 Spread and Rest Spread and Rest boths are donated by (...)  three doted USES:  Both are use in arrya and object  SPREAD Spread  is use to expand the array and object. 1. Spread behave with array  As mentioned above, the ... syntax is used to expand values. In this case, arr1 is being expanded inside arr2 using the spread operator. 2. Spread behave with object Obj2 is expand so obj behave like as a spread operator  Rest  Rest Operator with array    1. The rest operator is used to combine multiple values into a single array. It’s especially useful when we don’t know how many arguments a function will receive. function sum(...numbers) {   return numbers.reduce((a, b) => a + b, 0); } sum(1, 2, 3);  Rest with Object const user = {   name: 'Sameer',   age: 25,   location: 'India',   profession: 'Developer' }; const { name, ...rest } = user;   
Read more

Shallow Copy and Deep Copy in JavaScript

Image
Shallow Copy in JavaScript When we use the spread operator ( ... ) or methods like Object.assign() or slice() to copy an object or array, it creates a shallow copy . This means only the top-level properties are copied, while nested objects or arrays are still referenced , not cloned. 🧪 Example with Array let a = [ 10 , 20 , [ 30 , 40 ]]; let b = [ ... a ]; // Shallow copy b [ 0 ] = 100 ; console . log ( a ); // [10, 20, [30, 40]] console . log ( b ); // [100, 20, [30, 40]] Here , b is a shallow copy of a . When we change b [ 0 ], it doesn ’ t affect the original . So far , so good . But now , let ’ s try changing the nested array b [ 2 ][ 0 ] = 300 ; console . log ( a ); // [10, 20, [300, 40]] console . log ( b ); // [100, 20, [300, 40]] Now both a and b are affected! That’s the problem with shallow copies — the nested values are shared by reference . Deep copy solves the problem of modifying nested arrays without affecting the original array. For ...
Read more
Image
   DOCKER Docker Engine Docker CLI - Command line interface Docker registry Docker Engine is an open-source containerization technology that allows developers to package applications into container Containers are standardized executable components combining application source code with the operating system (OS) libraries and dependencies required to run that code in any environment. 2. Docker CLI The command line interface lets you talk to the docker engine and lets you start/stop/list containers docker run -d -p 27017 : 27017 mongo \4 3. Docker registry The docker registry is how Docker makes money. It is similar to github , but it lets you push images rather than sourcecode Images vs containers Docker Image A Docker image is a lightweight, standalone, executable package that includes everything needed to run a piece of software, including the code, a runtime, libraries, environment variables, and config files. Docker Container A container is a running instance of an im...
Read more