00:00 - git merge 12:37 - git rebase FREE Tutorials - In Git there are 2 ways to integrate changes from one branch to another git merge git rebase git merge - Is a non-destructive operation - Existing branches are not changed in any way - Creates a new merge commit in the feature branch git rebase - Moves the entire feature branch to begin on the tip of the master branch - Re-writes the project history - We get much cleaner and linear project history GitHub - Udemy - Training by Raghav at your venue - @ Training schedule - ------------ UI TESTING ------------ Selenium Beginners - Selenium Java Framework from Scratch - Selenium Python - Selenium Tips - Selenium Builder - Katalon Studio - Robot Framework with RIDE- Robot Framework with Eclipse - Protractor - ------------ API TESTING ------------ Web Services (API) - SoapUI - Postman - General - Katalon Studio API Testing - ------------ MOBILE TESTING ------------ Appium - Mobile Playlist - ------------ CI | CD | DEVOPS ------------ Jenkins Beginner - Jenkins Tips & Trick - Docker - ------------ VERSION CONTROL SYSTEM ------------ Git & GitHub - ------------ PERFORMANCE TESTING ------------ JMeter Beginner - JMeter Intermediate - JMeter Advanced - JMeter Tips & Tricks - Performance Testing - ------------ PROGRAMMING ------------ Java Beginners - Java Tips & Tricks - GROOVY - JAVASCRIPT - ------------ IDE ------------ Visual Studio Code - ------------ MAVEN ------------ Maven - ------------ OTHERS ------------ Redis- Misc - Tools & Tips - QnA Friday- Sunday Special - Ask Raghav - Interviews - All Playlists - Keep Learning, Raghav Website - LifeCharger - Udemy Courses - Facebook - Twitter - Youtube - Instagram - You can support my mission for education by sharing this knowledge and helping as many people as you can.