Тёмный

Part 10 | Git Tutorial | Git Commands | How To Resolve Merge Conflicts 

SDET- QA
Подписаться 735 тыс.
Просмотров 44 тыс.
50% 1

Topic : How To Resolve Merge Conflicts
#########################
Udemy Courses:
#########################
Manual Testing+Agile with Jira Tool
************************************
► shorturl.at/xNXZ4
Selenium with Java+Cucumber
********************************
► shorturl.at/aIKMW
Selenium with Python & PyTest
********************************
► shorturl.at/ELW09
Selenium with python using Robot framework
****************************************
► shorturl.at/bcDPZ
API Testing(Postman, RestAssured & SoapUI)
*****************************************
► shorturl.at/uAWY7
Web & API Automation using Cypress with Javascript
********************************************
► rb.gy/4uum2n
Playwright with Javascript
**************************
► shorturl.at/gALZ1
Jmeter-Performance Testing
************************
► rb.gy/ocj7r2
SDET Essencials(Full Stack QA)
*************************
► rb.gy/hlnf2v
Appium-Mobile Automation Testing
************************************
► rb.gy/wmzv64
Java Collections
*****************
► bit.ly/3S66ezE
Python Programming
*********************
► urlis.net/gdsf...
Cucumber BDD Framework
***************************
► bit.ly/3F7d69r
Protractor with Javascript
***************************
► urlis.net/4udd...
####################################
RU-vid Playlists:
####################################
Manual Testing & Agile
***********************
► bit.ly/3ujvaYa
► bit.ly/3OYzxQj
SQL
*************************
► bit.ly/3R6XjeG
► bit.ly/3nE0a1s
► bit.ly/3IeKuuJ
linux & Shell Scripting
**********************
► bit.ly/3up1Z6a
► bit.ly/3nzvGxx
Java
**********************
► bit.ly/3R9QfOs
► bit.ly/3AoRMKM
► bit.ly/3IbTTDn
► bit.ly/3ybXInv
► bit.ly/3yCoHdw
Selenium With Java+Cucumber
********************************
► bit.ly/3P2FMm4
► bit.ly/3yhiIt4
► bit.ly/3uokzet
► bit.ly/3a7XIND
► bit.ly/3umN2S9
► bit.ly/3aar7GW
► bit.ly/3y9kD2S
► bit.ly/3uhLskn
Python
********************************
► bit.ly/3agNgU0
► bit.ly/3NJNnoy
► bit.ly/2CTQ4mR
► bit.ly/3OIYWh1
Selenium With Python,Pytest&Behave
***************************************
► bit.ly/3OHHoC9
► bit.ly/3IeNLdv
► bit.ly/2J4tPeT
► bit.ly/3ydSkAq
Selenium With Python Using Robert Framework
(Web&API Testing)
*************************************************
► bit.ly/3nUvlpr
► bit.ly/3nUvE3z
API Testing (Postman,SoapUi,&Rest Assured)
**********************************************
► bit.ly/3OXacWY
► bit.ly/3yh0UhE
► bit.ly/3nC9DWQ
► bit.ly/3yGfhNS
► bit.ly/3OJa11H
► bit.ly/3P2slCC
Mobile App Testing Appium
****************************
► bit.ly/3Al49HG
Performance Testing Jmeter
*******************************
► bit.ly/3nz4fE7
Maven,Jenkins,Git,Github,CI/CD
*******************************
► bit.ly/3P16HPj
► bit.ly/3yhlUVA
► bit.ly/3afYfwT
► bit.ly/3yGzweG
► bit.ly/3yF73Ws
► bit.ly/3NCOmH7
SQL,DB Testing&ETL,Bigdata
*******************************
► bit.ly/3NKOcNY
► bit.ly/3OVpDyI
► bit.ly/3NEvUy0
► bit.ly/3IryxlT
► bit.ly/3RkWBLh
JavaScript Based Automation Tools
********************************
► bit.ly/3nUx51X
► bit.ly/3AqI6Q0
► bit.ly/3yeurbT
► bit.ly/3ujzpTK
Selector Hub Tools
********************
►rb.gy/h3h424
GraphQL
******************
► rb.gy/sj3gys
Cypress API Testing
********************
► shorturl.at/fjKPX
Cypress Web Testing
**********************
► shorturl.at/agjlK
Playwright with Javascipt
**************************
► shorturl.at/adSTY
#GitTutorial
#GitCommands
#MergeConflicts
#VersionControl
#GitBasics
#CodeManagement
#Versioning
#GitForBeginners
#BranchingAndMerging
#GitWorkflow
#ConflictResolution
#GitMasterclass
#CodeCollaboration
#GitTricks
#GitLearning
#MergeConflictResolution
#GitTips
#GitBranches
#AdvancedGit
#CodeVersioning
#GitSkills
#GitCommandsExplained
#GitMastery
#GitCollaboration
#GitEssentials
#BranchManagement
#CodeMergeTips
#GitExplained
#MergeConflictSolutions
#GitForDevelopers
#GitBestPractices
#GitMergeTechniques
#GitTutorialsOnline
#GitMergeTips
#CodeConflicts
#GitCoding
#GitMergeMadeEasy
#GitWorkflows
#MergeConflictWalkthrough
#GitMergeStrategies
#GitCodingTips
#GitCollaborativeWork
#GitMergeDemystified
#CodeConflictResolution
#GitMergeTroubleshooting
#GitCollab
#GitMergeWizardry
#GitTroubleshooting
#GitMergeConfidence
#GitMergeConflictsExplained

Опубликовано:

 

21 окт 2024

Поделиться:

Ссылка:

Скачать:

Готовим ссылку...

Добавить в:

Мой плейлист
Посмотреть позже
Комментарии : 53   
@Its_techtest
@Its_techtest 7 дней назад
The way you explain is so precise that anyone could understand the concept
@Addistoday
@Addistoday 10 месяцев назад
this is amazing hands on training! Much love and respect from Ethiopia!
@sdetpavan
@sdetpavan 10 месяцев назад
Thanks
@chinli72
@chinli72 3 года назад
The clearest explanation about GIT merge I have seen. Thank you very much.
@zehrairkicatal2156
@zehrairkicatal2156 2 года назад
You are number 1 about teaching GitHub, resolving conflict is so clear with your explanations, many thanks
@satishchodisetti2297
@satishchodisetti2297 Год назад
Very Simple and Super Explanation, Thank you sir.
@sdetpavan
@sdetpavan Год назад
You are most welcome
@samratjulme8418
@samratjulme8418 2 года назад
very helpful and informative.............god bless u sir 🙌🙌🙌🙌🙌🙌👍👍👍👌👌👌🙏🙏🙏
@sdetpavan
@sdetpavan 2 года назад
Keep watching
@pradeepbhat26
@pradeepbhat26 3 года назад
Amazing series sir!! Very easy to follow and understand. Really like the way you recap the concepts multiple times during the session. We don't have to go back and forth for that. Thanks again!
@sdetpavan
@sdetpavan 2 года назад
Welcome
@nshanthi7668
@nshanthi7668 2 года назад
Outstanding explanation with pictorial representation. Thank you so much.
@sdetpavan
@sdetpavan 2 года назад
You're very welcome!
@abdulshukur9501
@abdulshukur9501 2 года назад
very easy way to understand , good explanation ...thanks sir
@vrb199
@vrb199 2 года назад
Incredible explanation , easy to understand, Greatful to you sir for all your videos
@sagarzambre7205
@sagarzambre7205 Год назад
Well explained, Thanks for this
@sdetpavan
@sdetpavan Год назад
Welcome
@vikasbisht2192
@vikasbisht2192 Год назад
great easy explanation.
@sdetpavan
@sdetpavan Год назад
Glad it was helpful!
@Jadon09
@Jadon09 3 года назад
Thanks for making such amazing videos
@sdetpavan
@sdetpavan 2 года назад
Welcome
@tzo8653
@tzo8653 9 месяцев назад
great video sir, thank you so much
@sdetpavan
@sdetpavan 9 месяцев назад
You are most welcome
@janu2725
@janu2725 3 года назад
Hi Pavan sir, Very clean Explanation, I can understand easily. Thank you so much for your efforts. Can you please explain the Azure devops as well along with Git push , pull, PR approval, etc .. also repository clone. Thanks in Advance
@nidinkumar7529
@nidinkumar7529 5 месяцев назад
Hello Sir one doubt: Please answer. So basically after manually clearing the conflict, we are updating the file in master branch and doing a manual commit (Which is MC) correct? unlike what happens if we merge without any conflicts where GIT is automatically creating new Commit.
@fira222
@fira222 3 года назад
Excellent explanation...Thank you very much
@sdetpavan
@sdetpavan 2 года назад
You’re welcome
@ShivayTheDistroyer
@ShivayTheDistroyer 2 года назад
Nice
@sdetpavan
@sdetpavan 2 года назад
Thanks
@Jadon09
@Jadon09 3 года назад
Please make videos on Hadoop and spark
@sweetthirty2
@sweetthirty2 6 месяцев назад
Creating a child branch and creating a new separate branch both are same thing??
@adithyaraj307
@adithyaraj307 Год назад
Hello sir small doubt here, so merge conflicts will only happens when we change the same file at same location(line) inside 2 different branches, then only conflicts will happened right, for example if we change same file at different locations(line) then it won't happened, correct me if I was wrong...
@manimohanm1323
@manimohanm1323 2 года назад
Sir. I have a question here, you directly merge the feature branch into master, but we need to raise pull request right? .. how we can resolve conflict in the feature branch ?
@kalpanasuryawanshi7390
@kalpanasuryawanshi7390 3 года назад
Thank you sir🙏
@sdetpavan
@sdetpavan 2 года назад
Welcome
@KkdvPrasad
@KkdvPrasad 3 года назад
@SDET After this GIT tutorial, Please do a video on Jenkins CI/CD with pipeline concept, How Automation testing suite will execute for new feature release build happen, can you show this process for us.
@sdetpavan
@sdetpavan 3 года назад
It's already done
@sdetpavan
@sdetpavan 3 года назад
ru-vid.com/video/%D0%B2%D0%B8%D0%B4%D0%B5%D0%BE-1ji_9scA2C4.html
@Vijayawada-k3p
@Vijayawada-k3p 2 года назад
Can we do these operations through windows powershell without using Linux commands like touch,vim etc
@dineshmpdr
@dineshmpdr 3 года назад
You are legend sir
@sdetpavan
@sdetpavan 2 года назад
Thanks
@akshaymaske5
@akshaymaske5 3 года назад
May i know sir this series will contain how much count of videos ? Will this series enough to learn GIT and GITHUB, means will u cover all topics..
@KaranSharmaJi
@KaranSharmaJi 3 года назад
Rebase would keep that graph linear. Any thoughts on using rebase instead of merge here?
@AMITKUMAR-ys4oe
@AMITKUMAR-ys4oe Год назад
We resolved merge conflicts in test.txt. So the conflict changes are done in test.txt present in master branch. Am i correct?
@jayagupta1826
@jayagupta1826 2 года назад
Please add sharepoint related testing video
@kanaksingh8542
@kanaksingh8542 3 года назад
We already clear the conflicts then why we deleted the feature branch?
@kalpanasuryawanshi7390
@kalpanasuryawanshi7390 3 года назад
How to download manual project documents .. please guide us.
@sdetpavan
@sdetpavan 2 года назад
www.pavantestingtools.com/p/manual-testing-project.html
@KkdvPrasad
@KkdvPrasad 3 года назад
@SDET How the approval happen for the Github code? May i know the next upcoming video
@sdetpavan
@sdetpavan 3 года назад
ru-vid.com/video/%D0%B2%D0%B8%D0%B4%D0%B5%D0%BE-HCeBd5GKNO8.html
@KkdvPrasad
@KkdvPrasad 3 года назад
@@sdetpavan thanks for the update
@Sangeetize
@Sangeetize 3 года назад
Amazing explanation. Can you please make series for Citrus -Cucumber framework integration in Java ?
@sekharreddy3236
@sekharreddy3236 Месяц назад
Rebase concept is a bit confusing
Далее
Part 11 | Git Tutorial | Git Commands | Git Rebase
36:36
Git merge and git conflicts
39:37
Просмотров 23 тыс.
Part 9 | Git Tutorial | Git Commands | Merging
41:32
Просмотров 38 тыс.
How To Resolve GIT Merge Conflicts | GIT HUB | Ashok IT
1:09:04
Part 8 | Git Tutorial | Git Commands | Branching
35:46
Resolve Git MERGE CONFLICTS: The Definitive Guide
8:02