title
Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Training | Edureka

description
***** DevOps Training : https://www.edureka.co/devops-certification-training ***** In this Edureka YouTube live session, we will show you how to resolve merge conflicts in Git. Below are the topics that will be covered in this live session: 1. What is Git 2. Git Commands 3. Git Workflows 4. How to Handle Merge Conflicts Check our complete DevOps playlist here: http://goo.gl/O2vo13 DevOps Tutorial Blog Series: https://goo.gl/P0zAfF Subscribe to our channel to get video updates. Hit the subscribe button above. ----------𝐄𝐝𝐮𝐫𝐞𝐤𝐚 𝐃𝐞𝐯𝐎𝐩𝐬 𝐓𝐫𝐚𝐢𝐧𝐢𝐧𝐠𝐬----------- 🔵DevOps Online Training: https://bit.ly/3GOAlD5 🔵Kubernetes Online Training: https://bit.ly/3q0zrg1 🔵Docker Online Training: https://bit.ly/3DYPCj9 🔵AWS Certified DevOps Engineer Online Training: https://bit.ly/3pXnB6y 🔵Azure DevOps (Az-400) Online Training: https://bit.ly/3m8WmVr ----------𝐄𝐝𝐮𝐫𝐞𝐤𝐚 𝐃𝐞𝐯𝐨𝐩𝐬 𝐌𝐚𝐬𝐭𝐞𝐫𝐬 𝐏𝐫𝐨𝐠𝐫𝐚𝐦---------- 🔵DevOps Engineer Masters Program: https://bit.ly/3pXp1Ou -----------𝐄𝐝𝐮𝐫𝐞𝐤𝐚 𝐔𝐧𝐢𝐯𝐞𝐫𝐬𝐢𝐭𝐲 𝐏𝐫𝐨𝐠𝐫𝐚𝐦---------- 🌕 Post Graduate Program in DevOps with Purdue University: https://bit.ly/3yqRlMS Facebook: https://www.facebook.com/edurekaIN/ Twitter: https://twitter.com/edurekain LinkedIn: https://www.linkedin.com/company/edureka #Git #GitHub #DevOpsTools #DevOpsTraining #DevOpsTutorial #DevOpsGit #Git #GitHub #GitTutorial #GitTutorialforBeginners #GitRebase #GitAdd #GitBranching #GitMerge #GitBash #GitCommit #GitClone #GitCommands #GitCheckout #GitConfig - - - - - - - - - - - - - - About the Course Edureka’s DevOps online training is designed to help you master key tools of Devops lifecycle like Docker, Puppet, Jenkins, Nagios, GIT, Ansible, SaltStack and Chef used by a DevOps Engineer for automating multiple steps in SDLC. During this course, our expert DevOps instructors will help you: 1. Understand the concepts and necessities of DevOps 2. Understand the need for DevOps and the day-to-day real-life problems it resolves 3. Learn installation and configuration of common infrastructure servers like Apache, and Nginx for the Enterprise 4. Learn popular DevOps tools like Jenkins, Puppet, Chef, Ansible, SaltStack, Nagios and GIT 5. Implement automated system update, installations and deployments 6. Learn Virtualization Concepts 7. Configuration deployment and packaging, continuous integration using GIT 8. Fine tune Performance and set-up basic Security for Infrastructure 9. Manage server operations using Code which is popularly known as Infrastructure as a Code 10. Understand the need for and concepts of Monitoring and Logging. Along with the above mentioned topics, to help you master the most popular DevOps tools, you will also receive 3 additional self-paced courses including presentations, class recordings, assignments, solutions for the following tools: 1: Ansible - Covers Introduction, Setup & Configuration, Ansible Playbooks, 37 Ansible Modules, Different Roles and Command Line usage. 2: Chef - Covers Introduction, Building the Cook Book, Node Object & Search, Data-bags, Chef environment, Roles, Deploying Nodes in Production and using the Open Source Chef Server. 3: Puppet - Covers Puppet Infrastructure & run-cycle, the Puppet Language, Environment defining Nodes and Modules, Provisioning a Web Server and Executing Modules Against A Puppet Master. - - - - - - - - - - - - - - Who should go for this course? DevOps practitioners are among the highest paid IT professionals today, and the market demand for them is growing rapidly. With emergence of new job roles around DevOps philosophy, anyone aspiring to get into these new roles, can take up this DevOps course. Some of these roles are: 1. DevOps Architect 2. Automation Engineer 3. Software Tester 4. Security Engineer 5. Integration Specialist 6. Release Manager - - - - - - - - - - - - - - Project Work 1. Host a dummy webpage using Apache Web Server. 2. Write shell script which reports: a) Various system configurations related to the user and the OS. b) Data related to load on the server. c) Top 5 processes with maximum number of threads. d) Sort the services by memory 3. Install Nagios on a VM node for monitoring the various parameter of the VM. For more information, please write back to us at sales@edureka.co or call us at IND: 9606058406 / US: 18338555775 (toll-free). Customer Reviews: Ankur Kashyap, DevOps, Build & Release says: “I was enrolled into Devops training from Edureka On a professionalism, they provide a great presentation on the topic that helps to understand the indepth of Devops technology. Good knowledgeable staff, provide recorded sessions with life time warranty. Also technical team is really helpful if you stuck in some demo sessions. Keep it up !! ”

detail
{'title': 'Git Merge Conflict Tutorial | Resolving Merge Conflicts In Git | DevOps Training | Edureka', 'heatmap': [{'end': 864.748, 'start': 775.843, 'weight': 0.709}], 'summary': 'Covers various aspects of git workflows, conflict handling, and repository setup, providing an introduction to git workflows and merge conflict handling, exploring centralized, feature branch, and git flow workflows, conflict resolution processes, and the gitflow workflow for managing larger projects.', 'chapters': [{'end': 171.746, 'segs': [{'end': 53.01, 'src': 'embed', 'start': 27.306, 'weight': 0, 'content': [{'end': 33.35, 'text': "We'll see all the Git commands that we use, the different Git workflows that different dev teams follow.", 'start': 27.306, 'duration': 6.044}, {'end': 36.617, 'text': 'and how to handle merge conflicts in each of the workflows.', 'start': 33.735, 'duration': 2.882}, {'end': 40.08, 'text': 'So this is the short agenda for today.', 'start': 38.119, 'duration': 1.961}, {'end': 44.764, 'text': 'Now let us take a brief look at what is Git and what does it actually do.', 'start': 40.881, 'duration': 3.883}, {'end': 53.01, 'text': 'So Git is a version control software that is mainly used in software development to help to manage your code better.', 'start': 45.745, 'duration': 7.265}], 'summary': 'Covering git commands, workflows, and merge conflicts in software development.', 'duration': 25.704, 'max_score': 27.306, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI27306.jpg'}, {'end': 129.418, 'src': 'embed', 'start': 67.742, 'weight': 1, 'content': [{'end': 77.289, 'text': 'And sometimes you would want to go back to the previous versions because the newly added features might not be working out the way you want to or because of any other reasons.', 'start': 67.742, 'duration': 9.547}, {'end': 84.195, 'text': 'And Git will help you to roll back because it has been keeping snapshots every time you change something.', 'start': 77.77, 'duration': 6.425}, {'end': 86.872, 'text': 'And these snapshots are known as version one.', 'start': 84.591, 'duration': 2.281}, {'end': 89.534, 'text': "So let's say that this is your initial code.", 'start': 87.593, 'duration': 1.941}, {'end': 94.037, 'text': 'You made some other changes in the initial code that will keep a version for that.', 'start': 89.594, 'duration': 4.443}, {'end': 98.119, 'text': 'And similarly, as time passes by, it will keep different versions.', 'start': 94.537, 'duration': 3.582}, {'end': 102.862, 'text': 'And whenever you want to go back to any of the working versions, you can do that with the help of Git.', 'start': 98.239, 'duration': 4.623}, {'end': 105.883, 'text': 'So this is how Git helps in code management.', 'start': 103.722, 'duration': 2.161}, {'end': 109.425, 'text': 'So now let us take a look at the Git basic commands.', 'start': 106.804, 'duration': 2.621}, {'end': 117.532, 'text': "So if you want to create repositories, let's say you want to create Your local repository, you just have to initialize it using git init.", 'start': 111.146, 'duration': 6.386}, {'end': 120.653, 'text': 'Or if there is an existing repository, you can use git clone.', 'start': 117.972, 'duration': 2.681}, {'end': 125.456, 'text': 'If you want to make changes in your file, you can use different commands.', 'start': 121.834, 'duration': 3.622}, {'end': 129.418, 'text': 'You can use git status to see whether a file is there in your index or not.', 'start': 125.476, 'duration': 3.942}], 'summary': 'Git helps in code management by keeping snapshots of different versions, allowing for easy rollback. basic commands include git init, git clone, and git status.', 'duration': 61.676, 'max_score': 67.742, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI67742.jpg'}, {'end': 179.729, 'src': 'embed', 'start': 150.708, 'weight': 4, 'content': [{'end': 152.389, 'text': 'So for that, we add origin.', 'start': 150.708, 'duration': 1.681}, {'end': 157.313, 'text': 'We add the link of the central repository using this command, git remote add origin.', 'start': 153.03, 'duration': 4.283}, {'end': 162.878, 'text': 'And then if you want to pull all the files that are in the existing central repository, you use a git pull.', 'start': 157.914, 'duration': 4.964}, {'end': 168.264, 'text': 'And then finally, if you want to reflect your changes into the central repository, you can use git push.', 'start': 163.362, 'duration': 4.902}, {'end': 171.746, 'text': 'For parallel development, we have got git branch.', 'start': 168.884, 'duration': 2.862}, {'end': 179.729, 'text': 'It allows you to branch off from your main branch, and you can work on different features on a completely isolated branch using git branch.', 'start': 171.846, 'duration': 7.883}], 'summary': 'Using git commands to add origin, pull files, push changes, and create isolated branches for parallel development.', 'duration': 29.021, 'max_score': 150.708, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI150708.jpg'}], 'start': 5.131, 'title': 'Git workflows and conflict handling', 'summary': 'Provides an introduction to git workflows and merge conflict handling, covering commands, workflows, and the purpose of git in managing code versions for software development.', 'chapters': [{'end': 171.746, 'start': 5.131, 'title': 'Introduction to git workflows and conflict handling', 'summary': 'Focuses on git workflows and merge conflict handling, covering commands, workflows, and the purpose of git in managing code versions for software development.', 'duration': 166.615, 'highlights': ['The chapter discusses majorly on different Git workflows and how to handle merge conflicts, providing insights on commands and workflows used in Git. (Relevance: 5)', 'Git is a version control software used in software development to manage code versions, aiding in rolling back to previous versions and keeping snapshots of changes. (Relevance: 4)', 'The purpose of Git is to manage code by keeping versions and facilitating the rollback to previous working versions, ensuring better code management in software development. (Relevance: 3)', 'The basic commands in Git include git init for creating local repositories, git clone for existing repositories, git status for checking file status, git add for adding files to the index, and git commit for committing changes. (Relevance: 2)', 'For syncing repositories, commands such as git remote add origin, git pull, and git push are used to inform the local repository about the central repository, pull files from the central repository, and reflect changes into the central repository. (Relevance: 1)']}], 'duration': 166.615, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI5131.jpg', 'highlights': ['The chapter discusses majorly on different Git workflows and how to handle merge conflicts, providing insights on commands and workflows used in Git.', 'Git is a version control software used in software development to manage code versions, aiding in rolling back to previous versions and keeping snapshots of changes.', 'The purpose of Git is to manage code by keeping versions and facilitating the rollback to previous working versions, ensuring better code management in software development.', 'The basic commands in Git include git init for creating local repositories, git clone for existing repositories, git status for checking file status, git add for adding files to the index, and git commit for committing changes.', 'For syncing repositories, commands such as git remote add origin, git pull, and git push are used to inform the local repository about the central repository, pull files from the central repository, and reflect changes into the central repository.']}, {'end': 533.347, 'segs': [{'end': 255.655, 'src': 'embed', 'start': 213.512, 'weight': 0, 'content': [{'end': 220.095, 'text': 'So there is the centralized workflow where there is one central repository and only one working branch, which is the master branch.', 'start': 213.512, 'duration': 6.583}, {'end': 227.19, 'text': "Then there is the feature branch workflow where you have dedicated branches for each feature, and then you've got Git flow.", 'start': 220.523, 'duration': 6.667}, {'end': 232.775, 'text': "So we'll take a look at all of this and how to solve conflicts in each of these workflows.", 'start': 228.371, 'duration': 4.404}, {'end': 237.46, 'text': 'So now let us talk about the centralized workflow.', 'start': 234.837, 'duration': 2.623}, {'end': 244.607, 'text': 'So the centralized workflow uses a central repository to serve as a single point of entry for all changes to the project.', 'start': 238.103, 'duration': 6.504}, {'end': 248.53, 'text': 'And there is only one default development branch, and it is called the master.', 'start': 245.108, 'duration': 3.422}, {'end': 251.292, 'text': 'And all changes are committed into this branch.', 'start': 248.97, 'duration': 2.322}, {'end': 255.655, 'text': 'So this workflow does not require any branches besides the master.', 'start': 251.993, 'duration': 3.662}], 'summary': 'Comparison of centralized, feature branch, and git flow workflows for managing changes in projects.', 'duration': 42.143, 'max_score': 213.512, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI213512.jpg'}, {'end': 349.669, 'src': 'embed', 'start': 298.407, 'weight': 1, 'content': [{'end': 302.009, 'text': 'So his changes will be published into the repository with his recent commits.', 'start': 298.407, 'duration': 3.602}, {'end': 308.852, 'text': "And now let's say that Alice is also working on the same thing, and she wants to publish her changes in the central repository.", 'start': 302.989, 'duration': 5.863}, {'end': 314.995, 'text': 'But since Bob and Alice changed the same file in the same line, there will be a conflict.', 'start': 309.873, 'duration': 5.122}, {'end': 319.337, 'text': 'So let me show you how exactly does it happen and how to solve it.', 'start': 316.316, 'duration': 3.021}, {'end': 330.723, 'text': 'So here I have created repositories for Bob and Alice.', 'start': 327.702, 'duration': 3.021}, {'end': 334.284, 'text': 'So they are just in my system at different folders.', 'start': 331.123, 'duration': 3.161}, {'end': 339.346, 'text': 'So since I have to show you the scenario, I have to pretend to be two persons at one time.', 'start': 334.364, 'duration': 4.982}, {'end': 342.987, 'text': "So what I'll do, I'll just click Git Bash here.", 'start': 340.206, 'duration': 2.781}, {'end': 345.928, 'text': "Now I'm using Git for Windows, so you just don't have to do anything.", 'start': 343.007, 'duration': 2.921}, {'end': 349.669, 'text': 'You just click Git Bash here, and it will open up the Git Bash shell.', 'start': 345.948, 'duration': 3.721}], 'summary': 'Demonstrating conflict resolution in git repositories with multiple users.', 'duration': 51.262, 'max_score': 298.407, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI298407.jpg'}], 'start': 171.846, 'title': 'Git workflows and repository setup', 'summary': 'Delves into git workflows such as centralized, feature branch, and git flow, and explores conflict resolution processes. additionally, it covers setting up local repositories for bob and alice, connecting to a central repository on github, and committing changes.', 'chapters': [{'end': 319.337, 'start': 171.846, 'title': 'Git workflows and conflict resolution', 'summary': 'Discusses git workflows, including centralized, feature branch, and git flow, and explains the process of resolving conflicts in a centralized workflow with examples of branching, merging, and rebasing.', 'duration': 147.491, 'highlights': ["The chapter explains the centralized workflow, featuring a single central repository and master branch for all changes, with the requirement of pushing changes to the central repository using 'git push' after committing locally. In the centralized workflow, there is a single central repository with a master branch for all changes, and developers need to push their changes using 'git push' after committing locally.", 'It illustrates a conflict scenario in the centralized workflow where multiple developers working on the same file and same line encounter conflicts, requiring resolution methods. The example of Bob and Alice working on the same file and same line illustrates a conflict scenario in the centralized workflow, requiring resolution methods.', 'The chapter introduces different Git workflows, including the centralized, feature branch, and Git flow, and discusses their characteristics and usage. The chapter categorizes Git workflows into centralized, feature branch, and Git flow, explaining their characteristics and usage.']}, {'end': 533.347, 'start': 327.702, 'title': 'Setting up and syncing git repositories', 'summary': 'Covers setting up separate local repositories for bob and alice, connecting them to a central repository on github, pulling files from the central repository, and making changes and committing them to the local repositories.', 'duration': 205.645, 'highlights': ["Setting up separate local repositories for Bob and Alice The speaker demonstrates how to initialize separate local repositories for Bob and Alice using the 'git init' command.", "Connecting local repositories to a central repository on GitHub The speaker explains the process of adding the central repository as the origin using the 'git remote add origin' command and providing the link of the central repository.", "Pulling files from the central repository to local repositories The speaker demonstrates the use of the 'git pull origin master' command to pull files from the central repository to the local repositories.", 'Making changes and committing them to the local repositories The speaker illustrates the process of making changes to files in the local repositories and committing those changes.']}], 'duration': 361.501, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI171846.jpg', 'highlights': ['The chapter categorizes Git workflows into centralized, feature branch, and Git flow, explaining their characteristics and usage.', 'The example of Bob and Alice working on the same file and same line illustrates a conflict scenario in the centralized workflow, requiring resolution methods.', "The speaker demonstrates how to initialize separate local repositories for Bob and Alice using the 'git init' command.", "The chapter explains the centralized workflow, featuring a single central repository and master branch for all changes, with the requirement of pushing changes to the central repository using 'git push' after committing locally."]}, {'end': 869.611, 'segs': [{'end': 637.446, 'src': 'embed', 'start': 533.367, 'weight': 0, 'content': [{'end': 543.696, 'text': 'So first Bob will check the git status to see, sorry, So git status will show you whether a file has been added to the index or not.', 'start': 533.367, 'duration': 10.329}, {'end': 547.48, 'text': 'So if it is in red, it means that it has not been added to the index.', 'start': 543.776, 'duration': 3.704}, {'end': 551.505, 'text': "So for that, we'll have to add this file.", 'start': 549.182, 'duration': 2.323}, {'end': 556.69, 'text': "So we'll use the command git add and the name of our file.", 'start': 551.785, 'duration': 4.905}, {'end': 560.895, 'text': 'So now if you check git status.', 'start': 559.273, 'duration': 1.622}, {'end': 570.424, 'text': 'you can see that it is green now, so it means that it has been added to the index.', 'start': 565.942, 'duration': 4.482}, {'end': 573.945, 'text': 'it is there in the staging area and it is ready to be committed.', 'start': 570.424, 'duration': 3.521}, {'end': 582.688, 'text': "so now we'll use git commit in order to commit this and also remember that we have to commit using a message.", 'start': 573.945, 'duration': 8.743}, {'end': 588.59, 'text': "so for i'll just pause this bob changing.", 'start': 582.688, 'duration': 5.902}, {'end': 593.663, 'text': 'edureka Set is committed.', 'start': 588.59, 'duration': 5.073}, {'end': 600.511, 'text': "now Bob wants to push it to the central repository, so I'll use git push origin master.", 'start': 593.663, 'duration': 6.848}, {'end': 623.352, 'text': "And it's done.", 'start': 622.811, 'duration': 0.541}, {'end': 629.098, 'text': 'So if you go to your central repository now, so let me refresh this page.', 'start': 623.432, 'duration': 5.666}, {'end': 634.002, 'text': "So you can see Bob's commit over here.", 'start': 632.241, 'duration': 1.761}, {'end': 637.446, 'text': 'So that means that this file has been changed in the central repository.', 'start': 634.043, 'duration': 3.403}], 'summary': 'Bob added and committed a file, then pushed to central repository.', 'duration': 104.079, 'max_score': 533.367, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI533367.jpg'}, {'end': 756.822, 'src': 'embed', 'start': 709.551, 'weight': 4, 'content': [{'end': 715.096, 'text': "So it means that something was changed in the central repository, which Alice's local repository doesn't contain.", 'start': 709.551, 'duration': 5.545}, {'end': 717.257, 'text': 'And now it is centralized workflow.', 'start': 715.496, 'duration': 1.761}, {'end': 724.804, 'text': "And I don't want to mess around with my master branch because my master branch is supposed to always keep the production deployable code.", 'start': 717.798, 'duration': 7.006}, {'end': 731.229, 'text': "So instead of just pulling it directly, I'll use rebase.", 'start': 727.987, 'duration': 3.242}, {'end': 738.512, 'text': 'So what rebase will do is that it will always have the initial commits that will come from the central repository.', 'start': 732.089, 'duration': 6.423}, {'end': 746.256, 'text': 'It will just add up my commits on top of that workflow or my working tree that shows all my comments.', 'start': 738.673, 'duration': 7.583}, {'end': 748.778, 'text': "So I'll show how it works.", 'start': 747.537, 'duration': 1.241}, {'end': 752.019, 'text': "So for that, I'll not just pull it directly.", 'start': 749.178, 'duration': 2.841}, {'end': 756.822, 'text': "I'll use a different command, git pull.", 'start': 752.039, 'duration': 4.783}], 'summary': 'Using rebase to add commits from central repository, maintaining master branch integrity.', 'duration': 47.271, 'max_score': 709.551, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI709551.jpg'}, {'end': 864.748, 'src': 'heatmap', 'start': 775.843, 'weight': 0.709, 'content': [{'end': 781.504, 'text': "And even this message doesn't appear and you're confused where the conflict is, you can do one thing.", 'start': 775.843, 'duration': 5.661}, {'end': 782.884, 'text': 'Let me first clear the screen.', 'start': 781.524, 'duration': 1.36}, {'end': 788.665, 'text': 'You can use git status to see where the conflicting file is.', 'start': 785.384, 'duration': 3.281}, {'end': 792.191, 'text': 'So you can see that edureka.txt.', 'start': 789.69, 'duration': 2.501}, {'end': 797.031, 'text': "So in order to solve this conflict, I'll use git merge tool.", 'start': 793.451, 'duration': 3.58}, {'end': 807.874, 'text': 'So you can see it has opened up three files.', 'start': 805.433, 'duration': 2.441}, {'end': 810.154, 'text': 'So this is the file that Bob has changed.', 'start': 807.894, 'duration': 2.26}, {'end': 811.994, 'text': 'This is what was the original file.', 'start': 810.194, 'duration': 1.8}, {'end': 815.815, 'text': 'And this is what Alice have changed, right? So Alice can take a look.', 'start': 812.014, 'duration': 3.801}, {'end': 819.376, 'text': 'And this is the head where her initial commit right now points to.', 'start': 815.935, 'duration': 3.441}, {'end': 824.172, 'text': 'So she can decide whether to keep the changes or not.', 'start': 820.689, 'duration': 3.483}, {'end': 827.074, 'text': "And let's say that Alice wants to edit it.", 'start': 824.292, 'duration': 2.782}, {'end': 828.675, 'text': 'She wants to solve the conflict.', 'start': 827.254, 'duration': 1.421}, {'end': 832.959, 'text': "And let's say that she decides that she wants to keep both the two lines.", 'start': 829.436, 'duration': 3.523}, {'end': 840.045, 'text': "So let's remove all that.", 'start': 838.884, 'duration': 1.161}, {'end': 846.009, 'text': 'Save that file.', 'start': 844.848, 'duration': 1.161}, {'end': 849.072, 'text': 'Again, save and exit.', 'start': 847.771, 'duration': 1.301}, {'end': 852.46, 'text': 'Save and exit.', 'start': 851.519, 'duration': 0.941}, {'end': 854.081, 'text': 'Save and exit.', 'start': 853.34, 'duration': 0.741}, {'end': 856.142, 'text': 'All right.', 'start': 855.762, 'duration': 0.38}, {'end': 858.424, 'text': 'So now you can continue rebasing.', 'start': 856.322, 'duration': 2.102}, {'end': 860.965, 'text': 'So for that, you can use this command.', 'start': 858.984, 'duration': 1.981}, {'end': 864.748, 'text': "Okay, let me clear my screen so that you can see what I'm typing.", 'start': 861.826, 'duration': 2.922}], 'summary': 'Resolve conflicts using git merge tool and continue rebasing.', 'duration': 88.905, 'max_score': 775.843, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI775843.jpg'}], 'start': 533.367, 'title': 'Git operations and workflow', 'summary': 'Covers git operations including checking status, adding files, and committing with a message, as well as centralized workflow, conflict resolution, and maintaining deployable code in the master branch.', 'chapters': [{'end': 593.663, 'start': 533.367, 'title': 'Git status and file committing', 'summary': 'Explains the process of checking the git status, adding a file to the index, and committing it with a message, emphasizing the transition from red (not added to the index) to green (added to the index) and the requirement to commit using a message.', 'duration': 60.296, 'highlights': ["By using 'git status' Bob can check whether the file has been added to the index, with red indicating it hasn't been added yet.", "Using 'git add' followed by the file name, the file is added to the index, changing its status to green, indicating it's ready to be committed.", "When committing the file using 'git commit', it's important to include a message, such as 'bob changing. edureka Set is committed'."]}, {'end': 869.611, 'start': 593.663, 'title': 'Git centralized workflow and conflict resolution', 'summary': 'Covers the centralized workflow in git, involving pushing changes to the central repository, resolving conflicts using rebase and merge tools, and continuing the rebase process, emphasizing the need to maintain the production deployable code in the master branch.', 'duration': 275.948, 'highlights': ["The chapter covers the centralized workflow in Git and how to push changes to the central repository. It explains the process of using 'git push origin master' to push changes to the central repository.", "It discusses the issue of conflicting changes in the central repository and how to resolve conflicts using rebase and merge tools. It provides insights into using 'git rebase' to add local commits on top of the initial commits from the central repository and demonstrates using 'git merge tool' to resolve conflicts.", 'The chapter emphasizes the importance of maintaining the production deployable code in the master branch. It stresses the need to avoid directly pulling changes into the master branch and instead use rebase to maintain the production deployable code.']}], 'duration': 336.244, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI533367.jpg', 'highlights': ["By using 'git status' Bob can check whether the file has been added to the index, with red indicating it hasn't been added yet.", "Using 'git add' followed by the file name, the file is added to the index, changing its status to green, indicating it's ready to be committed.", "When committing the file using 'git commit', it's important to include a message, such as 'bob changing. edureka Set is committed'.", "The chapter covers the centralized workflow in Git and how to push changes to the central repository. It explains the process of using 'git push origin master' to push changes to the central repository.", "It discusses the issue of conflicting changes in the central repository and how to resolve conflicts using rebase and merge tools. It provides insights into using 'git rebase' to add local commits on top of the initial commits from the central repository and demonstrates using 'git merge tool' to resolve conflicts.", 'The chapter emphasizes the importance of maintaining the production deployable code in the master branch. It stresses the need to avoid directly pulling changes into the master branch and instead use rebase to maintain the production deployable code.']}, {'end': 1313.895, 'segs': [{'end': 969.867, 'src': 'embed', 'start': 917.123, 'weight': 1, 'content': [{'end': 921.386, 'text': 'So this is how you deal with conflicts when you are using a centralized workflow.', 'start': 917.123, 'duration': 4.263}, {'end': 925.369, 'text': 'So I hope that this is clear.', 'start': 923.647, 'duration': 1.722}, {'end': 933.014, 'text': 'So now let us talk about the feature branch workflow.', 'start': 930.152, 'duration': 2.862}, {'end': 940.839, 'text': 'So if your team is comfortable with the centralized workflow,', 'start': 937.918, 'duration': 2.921}, {'end': 948.3, 'text': 'but they want to streamline its collaboration efforts and it is definitely worth exploring the benefits of the feature branch workflow.', 'start': 940.839, 'duration': 7.461}, {'end': 953.641, 'text': 'So what happens here is that you dedicate an isolated branch to each feature,', 'start': 948.8, 'duration': 4.841}, {'end': 962.002, 'text': 'and because of this it is possible to initiate in-depth discussions around the new additions before you try to integrate them into the official project.', 'start': 953.641, 'duration': 8.361}, {'end': 969.867, 'text': 'So the core idea behind this feature branch workflow is that all feature development should take place in a dedicated branch instead of the master branch.', 'start': 962.462, 'duration': 7.405}], 'summary': 'Feature branch workflow allows in-depth discussions and isolates feature development from the master branch.', 'duration': 52.744, 'max_score': 917.123, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI917123.jpg'}, {'end': 1067.129, 'src': 'embed', 'start': 1037.519, 'weight': 0, 'content': [{'end': 1041.443, 'text': 'So pull requests are a way to initiate discussions around a branch.', 'start': 1037.519, 'duration': 3.924}, {'end': 1049.209, 'text': 'So they give other developers the opportunity to sign off on a feature branch before it gets integrated into the official project.', 'start': 1041.883, 'duration': 7.326}, {'end': 1052.192, 'text': 'So let me just show you an example of this again.', 'start': 1049.83, 'duration': 2.362}, {'end': 1058.04, 'text': 'So open up this repositories again.', 'start': 1056.058, 'duration': 1.982}, {'end': 1060.642, 'text': "So this is Bob's repository.", 'start': 1058.12, 'duration': 2.522}, {'end': 1067.129, 'text': "So let's say that Bob wants to now branch off and work on his new feature.", 'start': 1063.265, 'duration': 3.864}], 'summary': 'Pull requests initiate discussions on a branch before integration, providing opportunity for sign off.', 'duration': 29.61, 'max_score': 1037.519, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI1037519.jpg'}], 'start': 872.954, 'title': 'Dealing with merge conflicts and feature branch workflow', 'summary': 'Demonstrates resolving merge conflicts in a centralized workflow and outlines the benefits of the feature branch workflow, emphasizing the use of feature branches and pull requests for collaboration and code review.', 'chapters': [{'end': 1313.895, 'start': 872.954, 'title': 'Dealing with merge conflicts and feature branch workflow', 'summary': 'Demonstrates resolving merge conflicts in a centralized workflow and outlines the benefits of the feature branch workflow, emphasizing the use of feature branches and pull requests for collaboration and code review.', 'duration': 440.941, 'highlights': ['Resolving Merge Conflicts in Centralized Workflow Demonstrates resolving a merge conflict and successfully pushing changes to the central repository, emphasizing the importance of resolving conflicts in a centralized workflow.', 'Feature Branch Workflow and Benefits Explains the benefits of the feature branch workflow, including isolating feature development, facilitating in-depth discussions, and ensuring the master branch always contains production deployable code.', 'Using Pull Requests for Collaboration and Code Review Illustrates the use of pull requests to initiate discussions, obtain sign-offs, and facilitate code review in the context of a feature branch workflow, with practical examples of creating and managing pull requests in GitHub.']}], 'duration': 440.941, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI872954.jpg', 'highlights': ['Using Pull Requests for Collaboration and Code Review Illustrates the use of pull requests to initiate discussions, obtain sign-offs, and facilitate code review in the context of a feature branch workflow, with practical examples of creating and managing pull requests in GitHub.', 'Feature Branch Workflow and Benefits Explains the benefits of the feature branch workflow, including isolating feature development, facilitating in-depth discussions, and ensuring the master branch always contains production deployable code.', 'Resolving Merge Conflicts in Centralized Workflow Demonstrates resolving a merge conflict and successfully pushing changes to the central repository, emphasizing the importance of resolving conflicts in a centralized workflow.']}, {'end': 1646.231, 'segs': [{'end': 1374.047, 'src': 'embed', 'start': 1346.024, 'weight': 0, 'content': [{'end': 1351.729, 'text': 'So GitFlow workflow defines a strict branching model that is designed around the project release.', 'start': 1346.024, 'duration': 5.705}, {'end': 1360.116, 'text': 'So this is somewhat more complicated than feature branch workflow, but this provides a robust framework for managing larger projects.', 'start': 1352.309, 'duration': 7.807}, {'end': 1364.159, 'text': 'So this is what the entire branching model kind of looks like.', 'start': 1360.916, 'duration': 3.243}, {'end': 1365.7, 'text': "So you don't have to worry.", 'start': 1364.779, 'duration': 0.921}, {'end': 1374.047, 'text': "even though it looks very complex, this workflow does not add any new concepts or commands beyond what's required for the feature branch workflow.", 'start': 1365.7, 'duration': 8.347}], 'summary': 'Gitflow provides a robust branching model for project releases without adding new concepts or commands.', 'duration': 28.023, 'max_score': 1346.024, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI1346024.jpg'}, {'end': 1451.88, 'src': 'embed', 'start': 1426.454, 'weight': 1, 'content': [{'end': 1434.476, 'text': 'So the master branch here actually stores the official release history and then develop branch that serves as an integration branch for features.', 'start': 1426.454, 'duration': 8.022}, {'end': 1440.177, 'text': 'And it is very convenient to tag all the commits in the master branch as different versions.', 'start': 1435.276, 'duration': 4.901}, {'end': 1448.239, 'text': 'So here you have tagged it as version 1.0, 1.0.1, then 1.1.0, something like this.', 'start': 1440.717, 'duration': 7.522}, {'end': 1451.88, 'text': 'So whatever naming scheme that you are comfortable with.', 'start': 1448.619, 'duration': 3.261}], 'summary': 'Master branch stores official release history, tagged as versions 1.0, 1.0.1, 1.1.0, etc.', 'duration': 25.426, 'max_score': 1426.454, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI1426454.jpg'}, {'end': 1505.268, 'src': 'embed', 'start': 1480.632, 'weight': 2, 'content': [{'end': 1486.336, 'text': 'So feature branches combined with develop branch for all intended purposes to the feature branch workflow.', 'start': 1480.632, 'duration': 5.704}, {'end': 1488.757, 'text': 'but the Git workflow does not just stop there.', 'start': 1486.336, 'duration': 2.421}, {'end': 1494.521, 'text': "So once develop has acquired enough features for a release, or let's say a release date is coming up.", 'start': 1489.278, 'duration': 5.243}, {'end': 1498.304, 'text': 'So what do you do? You fork a release branch off to develop.', 'start': 1494.941, 'duration': 3.363}, {'end': 1502.546, 'text': 'And creating this branch start the next release cycle.', 'start': 1500.045, 'duration': 2.501}, {'end': 1505.268, 'text': 'So no new features can be added at this point.', 'start': 1502.627, 'duration': 2.641}], 'summary': 'Feature branches combine with develop branch for release cycles. new features cannot be added at this point.', 'duration': 24.636, 'max_score': 1480.632, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI1480632.jpg'}], 'start': 1315.933, 'title': 'Understanding git flow workflow', 'summary': 'Discusses the gitflow workflow, a branching model designed around project releases, providing a robust framework for managing larger projects and leveraging all the benefits of feature branch workflow. it covers the use of master branch for official release history and the develop branch for integrating features.', 'chapters': [{'end': 1646.231, 'start': 1315.933, 'title': 'Understanding git flow workflow', 'summary': 'Discusses the gitflow workflow, a branching model designed around project releases, providing a robust framework for managing larger projects and leveraging all the benefits of feature branch workflow, with the master branch storing the official release history and the develop branch serving as an integration branch for features.', 'duration': 330.298, 'highlights': ['The GitFlow workflow is designed around the project release, providing a robust framework for managing larger projects and leveraging all the benefits of feature branch workflow. The GitFlow workflow defines a strict branching model around the project release and provides a robust framework for managing larger projects, leveraging all the benefits of feature branch workflow.', 'The master branch stores the official release history, while the develop branch serves as an integration branch for features. The master branch stores the official release history, and the develop branch serves as an integration branch for features, with the convenient ability to tag all the commits in the master branch as different versions.', 'Once develop has acquired enough features for a release, a release branch is forked off to develop, initiating the next release cycle. Once the develop branch has acquired enough features for a release, a release branch is forked off to develop, initiating the next release cycle, during which only bug fixes, hot fixes, and patching up things can be done.']}], 'duration': 330.298, 'thumbnail': 'https://coursnap.oss-ap-southeast-1.aliyuncs.com/video-capture/1MVQYSlgXrI/pics/1MVQYSlgXrI1315933.jpg', 'highlights': ['The GitFlow workflow is designed around the project release, providing a robust framework for managing larger projects and leveraging all the benefits of feature branch workflow.', 'The master branch stores the official release history, while the develop branch serves as an integration branch for features.', 'Once develop has acquired enough features for a release, a release branch is forked off to develop, initiating the next release cycle.']}], 'highlights': ['The GitFlow workflow is designed around the project release, providing a robust framework for managing larger projects and leveraging all the benefits of feature branch workflow.', 'Using Pull Requests for Collaboration and Code Review Illustrates the use of pull requests to initiate discussions, obtain sign-offs, and facilitate code review in the context of a feature branch workflow, with practical examples of creating and managing pull requests in GitHub.', 'The chapter emphasizes the importance of maintaining the production deployable code in the master branch. It stresses the need to avoid directly pulling changes into the master branch and instead use rebase to maintain the production deployable code.', 'Feature Branch Workflow and Benefits Explains the benefits of the feature branch workflow, including isolating feature development, facilitating in-depth discussions, and ensuring the master branch always contains production deployable code.', 'The master branch stores the official release history, while the develop branch serves as an integration branch for features.', 'Once develop has acquired enough features for a release, a release branch is forked off to develop, initiating the next release cycle.', 'The chapter discusses majorly on different Git workflows and how to handle merge conflicts, providing insights on commands and workflows used in Git.', 'The chapter categorizes Git workflows into centralized, feature branch, and Git flow, explaining their characteristics and usage.', 'The example of Bob and Alice working on the same file and same line illustrates a conflict scenario in the centralized workflow, requiring resolution methods.', "The speaker demonstrates how to initialize separate local repositories for Bob and Alice using the 'git init' command.", "The chapter explains the centralized workflow, featuring a single central repository and master branch for all changes, with the requirement of pushing changes to the central repository using 'git push' after committing locally.", 'The purpose of Git is to manage code by keeping versions and facilitating the rollback to previous working versions, ensuring better code management in software development.', 'Git is a version control software used in software development to manage code versions, aiding in rolling back to previous versions and keeping snapshots of changes.', 'The basic commands in Git include git init for creating local repositories, git clone for existing repositories, git status for checking file status, git add for adding files to the index, and git commit for committing changes.', 'For syncing repositories, commands such as git remote add origin, git pull, and git push are used to inform the local repository about the central repository, pull files from the central repository, and reflect changes into the central repository.', "By using 'git status' Bob can check whether the file has been added to the index, with red indicating it hasn't been added yet.", "Using 'git add' followed by the file name, the file is added to the index, changing its status to green, indicating it's ready to be committed.", "When committing the file using 'git commit', it's important to include a message, such as 'bob changing. edureka Set is committed'.", "The chapter covers the centralized workflow in Git and how to push changes to the central repository. It explains the process of using 'git push origin master' to push changes to the central repository.", "It discusses the issue of conflicting changes in the central repository and how to resolve conflicts using rebase and merge tools. It provides insights into using 'git rebase' to add local commits on top of the initial commits from the central repository and demonstrates using 'git merge tool' to resolve conflicts.", 'The example of Bob and Alice working on the same file and same line illustrates a conflict scenario in the centralized workflow, requiring resolution methods.', "The chapter explains the centralized workflow, featuring a single central repository and master branch for all changes, with the requirement of pushing changes to the central repository using 'git push' after committing locally.", 'Resolving Merge Conflicts in Centralized Workflow Demonstrates resolving a merge conflict and successfully pushing changes to the central repository, emphasizing the importance of resolving conflicts in a centralized workflow.']}