Resolve Git Stash Merge Conflicts

Learning any Git technique can be this easy: learngit.io/
-----
Learn how to resolve Git stash merge conflicts.
WRITTEN ARTICLE & REFERENCE: www.themoderncoder.com/fix-gi...
GIT STARTER GUIDES: www.themoderncoder.com/git/
DESCRIPTION
What is Git stash, and how do you use it? Git stash allows you to set aside in-progress changes for later; however, If changes introduced by the stash conflict with changes on the current branch, you will see a Git merge conflict.
CHAPTERS
0:00 Intro
0:21 Merge conflict example
1:32 Workarounds
2:19 Fix stash merge conflicts
5:10 Cleanup
MY TECH
2020 M1 MacBook Air (I have the 512GB variant): amzn.to/3TTIBsE
AirPods Pro: amzn.to/3sRLUo5
Chair: amzn.to/3zJI9Fa
Gaming headset: amzn.to/3zwbT8i
Headphones (newer model): amzn.to/3Ub5reT
Keyboard: amzn.to/3FOOOC7
Mouse: amzn.to/3WhMFV9
Monitor: www.dell.com/en-us/work/shop/...
Monitor arm (newer model): amzn.to/3gXnlUa
Webcam: amzn.to/3zxxwp0
TECH ACCESSORIES
Laptop stand: amzn.to/3NuyqZ5
Mouse pad/mat: amzn.to/3U9QFVO
KVM switch: amzn.to/3gZmpP0
PC case: amzn.to/3Fx4Hg5
Under desk drawer: amzn.to/3WloFAo
VIDEO GEAR
Camera: amzn.to/3WkbiRe
Lens: amzn.to/3zxiTC4
Microphone: amzn.to/3SSUoWE
Main key light: amzn.to/3WhZbny
Secondary light: amzn.to/3fpRefx
Some of the links above are affiliate links which means, at no extra cost to you, I will make a small commission if you click them and make a qualifying purchase. Thanks for supporting the channel.
MUSIC CREDITS
Music from Uppbeat (free for Creators!):
uppbeat.io/t/danijel-zambo/st...
License code: WMSWEE2JFSTQTGST
ICON CREDITS
Treasure icons created by shmai - Flaticon
ABOUT ME
An experienced tech professional with experience including software engineering management, and software engineering. Formerly at Amazon for over 6 years, and currently living in NYC.
FOLLOW
Blog: www.themoderncoder.com
Twitter: / themoderncoder
#git #linux #programming #github

[@thisisreallyme3130]

This helped TY. My use case didn't visually or exactly align with yours so I backed up my files, went with your instructions, and it worked. For other readers, before he creates the "git stash"... that's not shown, but what gave me confidence was: backup files, then git stash, then in my branch still I did "git branch -v" and "git show -1" to get the clean (committed) hash of where I was. then checkout main/master and "git pull" on that (just so I could have an up to date master to compare to), then switch back to my branch then did this video. Basically I wanted to be able to look at the hash IDs between branches, so I understood better that I could fast forward then pop my stash. Cheers

[@surendrareddyGoluguri]

Good Explanation and animations are really helpful to understand the work flow process😊👍. Keep it up the good work😊. Thanks for uploading this video👍.

[@themoderncoder]

Thanks!

[@aidoka2000]

awesome and neat and easy to follow explanation.

[@tjmonkey15]

Hugely helpful. Thank you!

[@irfanrashid2114]

very helpful! thanks a lot for sharing

[@gambarimas]

Hello. I have a question, are stashes linked back somehow to the commit where we were when we created them? What happens if I try to apply a stash in a commit that has completely new files?

[@themoderncoder]

Yes, Git does track which commit the stashes were originally created from. You can use the "git stash branch" command to check out files into a new branch that's anchored off that original commit.

[@gambarimas]

@@themoderncoder Thanks for your answer. What about my second question?

[@xxcrypt234]

BRO thanks!