slide1 n.
Skip this Video
Loading SlideShow in 5 Seconds..
Git Merge and Rebase | Git Merge vs Rebase | Which One to Choose? | Devops Training | Edureka PowerPoint Presentation
Download Presentation
Git Merge and Rebase | Git Merge vs Rebase | Which One to Choose? | Devops Training | Edureka

Loading in 2 Seconds...

play fullscreen
1 / 19

Git Merge and Rebase | Git Merge vs Rebase | Which One to Choose? | Devops Training | Edureka - PowerPoint PPT Presentation


  • 113 Views
  • Uploaded on

** DevOps Training: https://www.edureka.co/devops **
This Git Merge and Rebase tutorial explains the difference between them and where they are used. Below are the topics covered in the tutorial:

1. Overview of Merge
2. Overview of Rebase
3. Interactive Rebasing
4. Rebasing- When NOT to do it
5. Git Workflow
6. Local Clean-up
7. Upstream Changes
8. Pull Request

Check our complete DevOps playlist here: http://goo.gl/O2vo13

loader
I am the owner, or an agent authorized to act on behalf of the owner, of the copyrighted work described.
capcha
    Presentation Transcript
    agenda

    Agenda

    ❑ What Is Artificial Intelligence ?

    ❑ What Is Machine Learning ?

    ❑ Limitations Of Machine Learning

    ❑ Deep Learning To The Rescue

    ❑ What Is Deep Learning ?

    ❑ Deep Learning Applications

    www.edureka.co/devops

    DevOps Certification Training

    merge

    Merge

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    overview a forked commit history

    Overview – A Forked Commit History

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    merge 1

    Merge

    git checkout feature

    git merge master

    OR

    git merge master feature

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    merge merging master into feature branch

    Merge – Merging Master Into Feature Branch

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    rebase

    Rebase

    git checkout feature

    git rebase master

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    rebase rebasing the feature branch onto master

    Rebase – Rebasing The Feature Branch Onto Master

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    rebasing when not to do it

    Rebasing- When NOT to do it

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    local clean up

    Local Clean-up

    git checkout feature

    git rebase –i HEAD~3

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    upstream changes 1

    Upstream Changes

    Collaborating on the Same Feature Branch

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    upstream changes 2

    Upstream Changes

    Merging vs Rebasing onto a new Branch

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    pull request

    Pull Request

    Git Merge and Rebase

    www.edureka.co/devops

    DevOps Certification Training

    www edureka co devops

    www.edureka.co/devops

    DevOps Certification Training