Resolve Git Stash Merge Conflicts
10.6 هزار بار بازدید -
2 سال پیش
-
Learning any Git technique can
Learning any Git technique can be this easy: https://learngit.io/
-----
Learn how to resolve Git stash merge conflicts.
WRITTEN ARTICLE & REFERENCE: https://www.themoderncoder.com/fix-gi...
GIT STARTER GUIDES: https://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): https://amzn.to/3TTIBsE
AirPods Pro: https://amzn.to/3sRLUo5
Chair: https://amzn.to/3zJI9Fa
Gaming headset: https://amzn.to/3zwbT8i
Headphones (newer model): https://amzn.to/3Ub5reT
Keyboard: https://amzn.to/3FOOOC7
Mouse: https://amzn.to/3WhMFV9
Monitor: https://www.dell.com/en-us/work/shop/...
Monitor arm (newer model): https://amzn.to/3gXnlUa
Webcam: https://amzn.to/3zxxwp0
TECH ACCESSORIES
Laptop stand: https://amzn.to/3NuyqZ5
Mouse pad/mat: https://amzn.to/3U9QFVO
KVM switch: https://amzn.to/3gZmpP0
PC case: https://amzn.to/3Fx4Hg5
Under desk drawer: https://amzn.to/3WloFAo
VIDEO GEAR
Camera: https://amzn.to/3WkbiRe
Lens: https://amzn.to/3zxiTC4
Microphone: https://amzn.to/3SSUoWE
Main key light: https://amzn.to/3WhZbny
Secondary light: https://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!):
https://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: https://www.themoderncoder.com
Twitter: Twitter: themoderncoder
#git #linux #programming #github
-----
Learn how to resolve Git stash merge conflicts.
WRITTEN ARTICLE & REFERENCE: https://www.themoderncoder.com/fix-gi...
GIT STARTER GUIDES: https://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): https://amzn.to/3TTIBsE
AirPods Pro: https://amzn.to/3sRLUo5
Chair: https://amzn.to/3zJI9Fa
Gaming headset: https://amzn.to/3zwbT8i
Headphones (newer model): https://amzn.to/3Ub5reT
Keyboard: https://amzn.to/3FOOOC7
Mouse: https://amzn.to/3WhMFV9
Monitor: https://www.dell.com/en-us/work/shop/...
Monitor arm (newer model): https://amzn.to/3gXnlUa
Webcam: https://amzn.to/3zxxwp0
TECH ACCESSORIES
Laptop stand: https://amzn.to/3NuyqZ5
Mouse pad/mat: https://amzn.to/3U9QFVO
KVM switch: https://amzn.to/3gZmpP0
PC case: https://amzn.to/3Fx4Hg5
Under desk drawer: https://amzn.to/3WloFAo
VIDEO GEAR
Camera: https://amzn.to/3WkbiRe
Lens: https://amzn.to/3zxiTC4
Microphone: https://amzn.to/3SSUoWE
Main key light: https://amzn.to/3WhZbny
Secondary light: https://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!):
https://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: https://www.themoderncoder.com
Twitter: Twitter: themoderncoder
#git #linux #programming #github
2 سال پیش
در تاریخ 1401/10/20 منتشر شده
است.
10,643
بـار بازدید شده