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

Topic : How To Resolve Merge Conflicts

#########################
Udemy Courses:
#########################

Manual Testing+Agile with Jira Tool
************************************

Selenium with Java+Cucumber
********************************

Selenium with Python & PyTest
********************************

Selenium with python using Robot framework
****************************************

API Testing(Postman, RestAssured & SoapUI)
*****************************************

Web & API Automation using Cypress with Javascript
********************************************

Playwright with Javascript
**************************

Jmeter-Performance Testing
************************

SDET Essencials(Full Stack QA)
*************************

Appium-Mobile Automation Testing
************************************

Java Collections
*****************

Python Programming
*********************

Cucumber BDD Framework
***************************

Protractor with Javascript
***************************

####################################
Youtube Playlists:
####################################

Manual Testing & Agile
***********************

SQL
*************************

linux & Shell Scripting
**********************

Java
**********************

Selenium With Java+Cucumber
********************************

Python
********************************

Selenium With Python,Pytest&Behave
***************************************

Selenium With Python Using Robert Framework
(Web&API Testing)
*************************************************

API Testing (Postman,SoapUi,&Rest Assured)
**********************************************

Mobile App Testing Appium
****************************

Performance Testing Jmeter
*******************************

Maven,Jenkins,Git,Github,CI/CD
*******************************

SQL,DB Testing&ETL,Bigdata
*******************************

JavaScript Based Automation Tools
********************************

Selector Hub Tools
********************

GraphQL
******************

Cypress API Testing
********************

Cypress Web Testing
**********************

Playwright with Javascipt
**************************

#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

[chinli]

The clearest explanation about GIT merge I have seen. Thank you very much.

[zehrairkicatal]

You are number 1 about teaching GitHub, resolving conflict is so clear with your explanations, many thanks

[Addistoday]

this is amazing hands on training! Much love and respect from Ethiopia!

[vrb]

Incredible explanation, easy to understand, Greatful to you sir for all your videos

[abdulshukur]

very easy way to understand, good explanation ...thanks sir

[janu]

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

[nshanthi]

Outstanding explanation with pictorial representation. Thank you so much.

[pradeepbhat]

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!

[samratjulme]

very helpful and bless u sir 🙌🙌🙌🙌🙌🙌👍👍👍👌👌👌🙏🙏🙏

[fira]

Excellent explanation...Thank you very much

[Jadon]

Please make videos on Hadoop and spark

[KaranSharmaJi]

Rebase would keep that graph linear. Any thoughts on using rebase instead of merge here?

[akshaymaske]

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..

[nidinkumar]

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.

[satishchodisetti]

Very Simple and Super Explanation, Thank you sir.

[manimohanm]

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 ?

[KkdvPrasad]

@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.

[adithyaraj]

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...

[rforrangoli]

Can we do these operations through windows powershell without using Linux commands like touch, vim etc

[sweetthirty]

Creating a child branch and creating a new separate branch both are same thing??