You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
> In Git, there are two main ways to integrate changes from one branch into another: the merge and the rebase. [Reference](https://git-scm.com/book/en/v2/Git-Branching-Rebasing#:~:text=In%20Git%2C%20there%20are%20two%20main%20ways%20to%20integrate%20changes%20from%20one%20branch%20into%20another%3A%20the%20merge%20and%20the%20rebase)
The text was updated successfully, but these errors were encountered:
Merge: Merging is the process of combining code from two different branches. When you merge one branch into another, Git creates a new commit that combines the changes from both branches. This is the most common way of integrating changes in Git. Here's an example:
git checkout branchA #switch to branchA
git merge branchB #merge branchB into branchA
Rebase: Rebasing is another way of integrating changes from one branch to another. Instead of creating a new commit, rebasing moves the entire branch to a new base commit.
git checkout branchA #switch to branchA
git rebase branchB #rebase branchA onto branchB
linkedin-skill-assessments-quizzes/git/git-quiz.md
Lines 446 to 448 in 6775b0e
The text was updated successfully, but these errors were encountered: