7 | Handle conflict while pulling and applying stash in GIT | by Hardik Patel
Resolve Conflict while other developer has done changes in same portion of file where you have done the changes at that time while pulling changes you might have commit available of that change or modified file than you either merge after resolving conflict or stash apply and then commit after resolving conflict.
Checkout my other videos of GIT Tutorial-
• 6 | How to resolve conflict while mer...
• 5 | GIT Commands - 3 Final | by Hardi...
• 4 | How to configure GIT | by Hardik ... Gears:
Microphone - T669-Condenser-Microphone-Adjustable-Scissor - https://amzn.to/3WB0XCs
Previous Microphone - Boya ByM1 - https://amzn.to/3Yc17Bv
Laptop - Mac book Pro M2 - https://amzn.to/46zEOIh
(Used in few videos to record in some it is used to edit videos)