Resolve Git Stash Merge Conflicts

[@kapilganwani1827]

This series on git commands is easily one of the most easiest I've found to follow, kudos!

[@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!