The document discusses different Git workflows including centralized, feature branch, and GitFlow workflows. It provides diagrams to illustrate how each workflow functions. It also covers Git commands and how to handle merge conflicts that can occur when integrating changes from multiple branches.

1. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
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

2. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Agenda
What is Git?
Git Commands
Git Workflows
How to handle merge conflicts

3. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
What is Git?

4. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
What is Git?
Git is a version control system for tracking changes in
computer files and coordinating work on those files
among multiple people. It is primarily used for source
code management in software development, but it can
be used to keep track of changes in any set of files.
Version 1 Version 2 Version 3 Version 4

5. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Git Basic Commands

6. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Git Basic Commands

7. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Git Workflows

8. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Git Workflow
Centralized
WorkFlow
GitFlow
WorkFlow
Feature Branch
WorkFlow

9. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Solving Merge Conflicts

10. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Centralized Workflow

11. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Centralized Workflow
Project X
Project X
Project X CONFLICT
Git push

12. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Feature Branch Workflow
MASTER
Feature B
Feature A

13. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Centralized Workflow
Feature B
Feature A
Feature A New Pull Request
Git push
Git push

14. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
GitFlow

15. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
Feature Branch Workflow

16. Copyright © 2017, edureka and/or its affiliates. All rights reserved.
WebDriver vs. IDE vs. RC
➢ Data Warehouse is like a relational database designed for analytical needs.
➢ It functions on the basis of OLAP (Online Analytical Processing).
➢ It is a central location where consolidated data from multiple locations (databases) are stored.