Resolving merge conflicts in git pull | automateNow
Learn how to resolve merge conflicts in git pull when using Sourcetree.
What are merge conflicts?
A merge conflict can occur when two developers update the same content in a Git repository.
You have four options when resolving merge conflicts.
1. Keep the changes the you made and discard the changes that the other person made.
2. Keep the changes that the other person made and discard your changes.
3. Discard your changes and those that the other person made and revert back to the original content.
4. Edit your changes or the other person's changes and keep the new content.
😀 Subscribe for weekly videos! 👍
📑 CHAPTERS
0:00 ~ What is a merge conflict
0:40 ~ Add a new feature branch
1:06 ~ Make local changes
1:37 ~ Review local changes
1:57 ~ Make remote changes
2:42 ~ Pull remote changes
3:15 ~ Stash local changes
3:45 ~ Apply stash
4:18 ~ Review conflicting files
5:17 ~ Run Meld
5:35 ~ Meld overview
6:42 ~ Keep your changes
7:27 ~ Keep their changes
7:47 ~ Keep original file
8:13 ~ Make new changes
8:51 ~ Saving changes
👩🎓 COURSES
☕ Java For Absolute Beginners https://bit.ly/learn-java2022
⏯ PLAYLISTS
☑️ Automation Fundamentals https://bit.ly/2QbN7qm
☑️ Automation Tools https://bit.ly/2OFj4qO
☑️ General WebDriver https://bit.ly/2Z3tG7y
☑️ Intro to WebDriver https://bit.ly/3gb5Jlx
☑️ Intermediate WebDriver https://bit.ly/2OBTR0r
☑️ Java https://bit.ly/3sBuI7M
☑️ Selenium 4 https://bit.ly/2VQ1lA9
☑️ Version Control https://bit.ly/3CvHplU
☑️ Web Element Locators https://bit.ly/2QfDGpK
📫 LET'S CONNECT!
☑️ https://linktr.ee/automateNow
Credits: "Subscribe button" by MrNumber112 | • Free Download: Subscribe Button + Not...
Смотрите видео Resolving merge conflicts in git pull | automateNow онлайн, длительностью часов минут секунд в хорошем качестве, которое загружено на канал automateNow 19 Ноябрь 2021. Делитесь ссылкой на видео в социальных сетях, чтобы ваши подписчики и друзья так же посмотрели это видео. Данный видеоклип посмотрели 1,682 раз и оно понравилось 17 посетителям.
