Become A Web Developer - Part 14: Git + Github | Andrei Neagoie | Skillshare

Become A Web Developer - Part 14: Git + Github

Andrei Neagoie, Senior Software Developer + Instructor

Become A Web Developer - Part 14: Git + Github

Andrei Neagoie, Senior Software Developer + Instructor

Play Speed
  • 0.5x
  • 1x (Normal)
  • 1.25x
  • 1.5x
  • 2x
2 Lessons (35m)
    • 1. Git + Github Part 1

      17:40
    • 2. Git + Github Part 2

      16:52
  • --
  • Beginner level
  • Intermediate level
  • Advanced level
  • All levels
  • Beg/Int level
  • Int/Adv level

Community Generated

The level is determined by a majority opinion of students who have reviewed this class. The teacher's recommendation is shown until at least 5 student responses are collected.

369

Students

--

Projects

About This Class

Git + Github

This is the tutorial you've been looking for to become a web developer in 2018. It doesn’t just cover a small portion of the industry. In this multipart video series we will covers everything you need to know to get hired: from absolute zero knowledge to being able to put things on your resume that will allow you to live the life you want. 

Sounds too good to be true? Give me 5 minutes of your time to explain to you why I built this course and what is different here than thousands of other courses all over the internet.

  1. There is no wasted time here. We won’t be using outdated technologies like PHP, Wordpress and JQuery. Although still useful, outdated technologies like the above are low paying and demands for them are decreasing. In this course, you will learn the specific technologies that are the most in demand in the industry right now. These include tools and technologies used by the biggest tech companies like Google, Facebook, Instagram, etc… It’s geared specifically for people that want to learn employable skills in 2018.

  2. After finishing this course, you will be able to apply for developer roles, or upgrade your job title as a developer and earn a higher salary. We won't be taking any shortcuts in this course. I am going to take your from absolute zero, where I teach you how the internet works, to mastery, where I show you how to build an image recognition app using a Machine Learning API (a subset of Artificial Intelligence).

  3. This course is taught by an instructor who has worked in silicon valley, and one of the top tech companies in Toronto. I have built large scale applications, and have managed a team of developers. I have worked directly with these technologies. I am not an online marketer or a salesman. I am a senior software developer who loves programming and believes that there needs to be a course out there that actually teaches valuable skills.

  4. I know your time is valuable. You want a course that outlines the best way to learn the topic in simple, well explained methods so that you fully understand topics instead of watching somebody on your screen and having no clue what is going on. I have created this course after consuming hundreds of books, tutorials, and online courses while I was learning. I have taken the best pieces, the best methods, that I have found, and condensed everything so that you can learn in the most efficient way possible. 50 hours of videos doesn't mean much if the instructor isn't engaging or focuses on outdated topics. 

  5. We have a thriving online chat community so you really feel like you are part of a classroom and not just watching videos by yourself. You will have a chance to communicate with fellow students, work on group projects together, and contribute to open source. Anytime you have a question you can ask in the chat and someone will surely be able to help you right away. 
  6. The course is designed to give you employable skills so you can get a job. Here is what one student recently wrote after taking the course and being hired right away: 
    "I’m a self taught dev, who has been out of work for ~6 months. I had some family things that came up that prevented me from seeking permanent employment, so for awhile I was Postmates/Uber delivery driver.
    After taking this course, I immediately got catapulted back to where I was before, but better equipped and with the knowledge to take on the next job. I had just finished the React section when I went to a recent interview, and it really helped me excel. As of today, I am officially re-employed back in the field, and it is all thanks to this course. I had a blast creating the final project, and FINALLY got around to learning SQL statements, and getting to use them in a project. I’m really ecstatic that Andrei went with teaching relational databases over something like MongoDB, which can also be fun, but is less practical for use on the job. So thanks Andrei , I really enjoyed the course and will be making sure to share it with others who find it helpful. I’m also looking forward to the new ES7/8 content that was recently added, and going through the DB stuff again when I go to build a personal project."

In this course, you will be taken through online videos and exercises where you will be able to do the following things by the end:

  • Build real complex applications and websites
  • Build an image recognition app together at the end of the course so you can add it to your portfolio
  • Go into a job interview confident that you understand the fundamental building blocks of web development and the developer space in 2018
  • Be able to go off on your own and grow your skills as a developer having built a solid foundation
  • Learn how front-end, servers, and databases communicate and how they all fit together in the eco system
  • Build your own startup landing page. 
  • Go off and remotely work by being a freelance developer and bid on projects.
  • Know EXACLTY what a day in the life of a developer is like and what the day to day technologies and tools will be that you are using. 

By the end of this course you will be comfortable using the below skills and you will be able to put them on your resume:

  • HTML5
  • CSS
  • Bootstrap 4
  • Javascript (ES6/ES7/ES8)
  • React + Redux
  • Git + Github
  • Node.js
  • Express.js
  • NPM
  • PostgresSQL
  • SQL

This course is the accumulation of all of my years working, learning, and teaching coding and all of the frustrations and incomplete information I have encountered along the way. There is so much information out there, so many opinions, and so many ways of doing things, that unless you have spent the last years working with these technologies in a company, you will never fully understand. So this course is the answer to that exact problem. I have gone through thousands of coding books and online tutorials and bootcamps. I have worked with these tools on real applications. Throughout the years I have taken notes on what has worked, and what hasn't and I've created this course to narrow down the best way to learn and the most relevant information. 

I will succeed if you succeed in this course. Therefore, I will be there every step of the way helping you understand concepts and answer any questions you have.

I am 100% confident that you won't find a course like this out there that is as well organized, and as useful, to build a strong foundation for you to start a new career. We're not going to be building simple todo applications and cat image sliders. We are going to learn actual practical skills that will put you into the workforce. Some unique sections that you won't find anywhere else are:

  • React.js + Redux: you will learn the library that companies like Netflix, Facebook and Instagram use to build fast, scalable applications. This is one of the highest in-demand skill in the industry.
  • A day in the life of a developer: What will your day to day look like and what tools will you use? I will take you through a sample day at a tech company.
  • How does the internet actually work. What is the history of these technologies: I will actually have you understand the underlying concepts of the internet, and how the technologies we have now, have come to be where they are.
  • How do you actually deploy a real life app so that it is secure, and won't get hacked: How does a real life app get out to the public?
  • What is Machine learning and how you can harness it's power: Whether you have heard about it or not, this is something that you will hear more and more in the coming years. Those who understand the high level concepts and can harness it will have an advantage. 
  • What is your developer environment on your computer look like: We will be setting up our computers with all the tools necessary of a developer so you can use the same setup when you go into the workforce.

Why do we teach the above? Because in this day and age, just knowing HTML CSS and Javascript is not good enough and you won't be able to grow in your role and command a higher salary. I am teaching you these things because these are the things you should know in 2018 so that you are miles ahead of the rest. 

Make this the year that you took a risk, you learned highly in demand skills, you had new experiences, and you received new opportunities. I hope you join me in this journey. 

This is the proudest work I have ever done in my life and I am confident that you won't find a course better than this. 

See you inside!

Taught by: 

Andrei is the instructor of the highest rated Web Development course on many platforms. His graduates have moved on to work for some of the biggest tech companies around the world like Apple. He has been working as a senior software developer in Silicon Valley and Toronto for many years, and is now taking all that he has learned, to teach programming skills and to help you discover the amazing career opportunities that being a developer allows in life. 

Having been a self taught programmer, he understands that there is an overwhelming number of online courses, tutorials and books that are overly verbose and inadequate at teaching proper skills. Most people feel paralyzed and don't know where to start when learning a complex subject matter, or even worse, most people don't have $20,000 to spend on a coding bootcamp. Programming skills should be affordable and open to all. An education material should teach real life skills that are current and they should not waste a student's valuable time.  Having learned important lessons from working for Fortune 500 companies, tech startups, to even founding his own business, he is now dedicating 100% of his time to teaching others valuable software development skills in order to take control of their life and work in an exciting industry with infinite possibilities. 

Andrei promises you that there are no other courses out there as comprehensive and as well explained. He believes that in order to learn anything of value, you need to start with the foundation and develop the roots of the tree. Only from there will you be able to learn concepts and specific skills(leaves) that connect to the foundation. Learning becomes exponential when structured in this way. 

Taking his experience in educational psychology and coding, Andrei's courses will take you on an understanding of complex subjects that you never thought would be possible.  

See you inside the course! 

Meet Your Teacher

Teacher Profile Image

Andrei Neagoie

Senior Software Developer + Instructor

Teacher

Andrei has been working as a senior software developer in Silicon Valley and Toronto for many years. He is now taking all that he has learned to teach others programming skills in order to discover the amazing career opportunities that being a developer allows in life. 

Having been self-taught, he understands that there is an overwhelming number of online courses, tutorials and books that are overly verbose and inadequate at teaching proper skills. Most people feel paralyzed and don't know where to start when learning a complex subject matter, or even worse, most people don't have $20,000 to spend on a coding bootcamp. Programming skills should be affordable and open to all. An education material should teach real-l... See full profile

Class Ratings

Expectations Met?
  • Exceeded!
    0%
  • Yes
    0%
  • Somewhat
    0%
  • Not really
    0%
Reviews Archive

In October 2018, we updated our review system to improve the way we collect feedback. Below are the reviews written before that update.

Your creative journey starts here.

  • Unlimited access to every class
  • Supportive online creative community
  • Learn offline with Skillshare’s app

Why Join Skillshare?

Take award-winning Skillshare Original Classes

Each class has short lessons, hands-on projects

Your membership supports Skillshare teachers

Learn From Anywhere

Take classes on the go with the Skillshare app. Stream or download to watch on the plane, the subway, or wherever you learn best.

phone

Transcripts

1. Git + Github Part 1: in this video, we're going to talk about get and get hub and source control. Now you might remember get help from our previous section where we used it to put the website online, but I'll show you that it is so much more than that. More importantly, getting get up is used by most professional companies, and it is a skill that is expected to be known by all developers now. So this is an important section. One of the first things most developers have to do on their first day of the job is to Mitt something called a Pull request, which uses, get and get up. We'll get through that in this section. Don't worry. You're gonna learn all of this, and it's going to make sense. Let's first start with source control. Up until now, we have on Lee worked on small fouls. No team members just ourselves, just a couple of files. But in real life, you're most likely not the only developer on a team. Most likely, the projects are huge. There's many, many files. Source control allows us to make sure that multiple people can work on the same fault from different locations think of it as Google docks that allows people to collaborate on one document. But enough talk. Let's actually check it out. I have over here, set up two folders. One is for myself, Andre, who just started a new job. But X company and I have Marcy here who has been working at the company for a while, and she has project files over here. I'm actually using the files from our background generator video. Now, without get or get up, what I can do is just copy and paste these files. So I have whatever Marcie has, and we can start working on these files. I can have my developer environment here with my terminal and my sublime tax. And I can work on whatever changes that need to be made on the APP. And Marcy over here also has her own version where she can work on it and we're both working on the same project. But let's say that both Marcy and I are working on this project and she decides to change the project name from Grady. Um, background, too. Super background. And at the same time in my project, I decided to call this cool background. Now you'll have to set up a meeting between myself and Marcy and decide how we should change the code. And this is a small example. But you can imagine that as different pull programmers worked together, there's always gonna be this issue of one person changing one thing and another person changing another thing. This is where source control came in, and so she controls a way to control this. Where we have one place instead of our own computers in this case is just represented by the folder that I haven't here. Instead of each of us having a copy of the project with Service Control, we have a copy of the project, but there is a centralized location up somewhere, maybe owned by the company or somewhere on the Internet that has the ultimate version that we each talk to to make sure that we each have the same version. Getting get hub is a way to do this, to be able to use search control, and as a matter of fact, it's the defacto way off doing this. So, like I said before, this is most likely the tool you'll be using every single day. Ah, your workplace. So if I go to the get Hub website here, what it allows us to do is it's a place essential place that both Andre and Marcie can talk . Teoh. So even though we work on the same files the same project, I can ask this central location such as Get up. Hey, has Marcy made any changes? And Marcie can ask. Hey, has Andre made any changes? And every once in a while you'll get something like this where we have cold background and super background, where we have something called a merge conflict. What get hub allows us to do is say, Hey, I noticed there is emerge conflict. I see that you guys have both changed your background. I don't know who's right, but here's the information. Andrea Marcy, can you guys talk amongst yourself and figure it out? That's pretty much the workforce, so let's actually see what this looks like. The first thing we want to do is set up a get publican. If you haven't done it in the previous exercises, you absolutely should start to get help account. It's free. And like I said before, if you're a developer, You just need to have it. It's where everybody puts their projects. It's where you work. You'll be spending a lot of time on this website. You might remember that when we had to get help Project I also told you to get get hub for desktop. Although we use that to make things simpler during that video, this is actually not the recommended way of doing it. It allows you to visually see and interact with get hub. But it's kind of looked down upon by employers, and most people use the terminal or the command prompt to actually do this. So I won't be teaching you this way. Just because I think it's bad practice and getting used to the terminal is important. I'm gonna close that and we're gonna get this start. The very first thing we're gonna do is we're gonna click on start a project and here we're going to call it whatever we want. We'll call it Background Generator and you also wanna leave it up as public. And we want to click on initialized this with a read me and we'll click, create repository And what that does what we've created. A new project on Get Hub. And here the read meat, which is just a file that describes your project. You can see that it's here. We can type into the read me whatever we want and will describe our project. But let's go back. If Marcy Let's say Marcie has been working at this company for a long time, I'm actually gonna remove my false here. Marcy has been working at this company for a long time, and the employer finally decided, Hey, we need to use get hub. We're gonna hire this new guy, Andre. We want to make sure that you both can work on it on the project together without any issues. Can you put the project up on get up. So when Marcie will do is she will go to get up, create background generator, and then she's going to click right over here to clone or download, and she's gonna make sure it says use https. And from here, you just click on this button which copies this link to your keyboard. Then Marcy goes to her terminal, and right now we're in documents. We want tohave the project in the Marcie folder, so I'll CD into Marcy if I click. Ls I see that yet? My have my files. Now, the first command that we're gonna learn is called Get clone. And then copy and paste. What we copy from the website were just saying, Hate, clone this project from get have dot com. So I press enter on. There you go. Everything is downloaded. If I go back to the folder now, I see that I have background generator. If I double click this, you'll see that I have a dot get folder here that's actually hidden. You might not even see it on your laptop if you don't have this feature on your computer and able. But this dog get now allows me to communicate with get up. So what we can do now? Marcie can copy and paste these files and put it into background generator. Now, let me show you the next. Get command, Marcy. Right now, if we see she's in her folder. But now we need to go into background generator because if we do any dick commands here, well, it won't work because it's not a good project. We need to actually go inside of the project. That was created on Get up. So I'm going to CD into that directory notice Here I have my terminal says so that it actually shows me what? Get hub location. I'm in and I'll explain one master means later. Now that we're here, we can look at all our files. Yep, I see that. Now I have my read me, which I created on Get up Plus the files that I copy and pasting. We need to sink this so that if I go into my background generator instead of the read me files Marcy Kin put up her files on get up. The way we do that is our second command. Get status. It tells us that we have on track files. That is, we have index at a she male scripture. Yes. And style that are on tract. And it says use get add file to include, Why you what will be committed? So now that we see our status off what we have in our folder, we can say get ad and the foul name so I could do index dot html Get had script dot Js and get ad style dot CSS. Let's clear this So we can see it. And now I can do get status again just to see what our statuses. And now I have your branches up to date changes to be committed. You see that now with AD. We've said, Hey, we want to add these changes. We have new files that we've added and says to be committed. So the second step is to do something called get, commit and get commit says Hey, I am committing that. These are the changes that I want to make to get help and it allows you to pass a message so that on get help, it'll show the message. When Andre comes back in, he can say Omar, she added. These files and this is the message. And we do that by doing this and within here within the double quotes, I can say, adding, starting project, Close the bracket Press center. I'm gonna clear this now. There is one last step we've added. We did get at to add our changes, then get commit to commit and say, Yeah, we're locking in those changes and then finally we need to let get hub dot com know that these are the changes So we do get push and there you go. It has now been pushed, too, this repository. So if I go back and I refresh, look at that. It's the same thing that we did when we put up our first website online. But instead of using the desktop version of Get Hub, we use the command line, and now we have our project, which is very good. Now let's go back to our example. So Marcie has been working on this project. There's a good repository and I just joined the company. And now I need to start working on this. What do I do now? I need to access get hub and get the copy of background generator The way I do that, well, I go into my folder and I do the same thing. I do get clone, and then I copy and paste the repository just like before, get clone and clone the repo. And there you go. If I go back to my folder, look at that. I have background generator, so we're both working now on background generator, but not off of each other's files were working with whatever version is on. Get up All right, so now, more realistic. We go back to working, and on the first day of my job, I say I'm gonna change the grainy a background title. Actually, the H one tag to cool generator if I see this, and I do get status. Well, I'm not in a give repository right now. If you remember, I have to go into background generator. Let me open that up a base week and see. There you go again. These git commands won't work if you're not in a folder that has the docket folder. So let me do that CD into background generator. I'm gonna clear this, and I'm going to say get status and look at that. It tells me that I've modified index dot html five, and if you remember, I will say get had I only have one file. I can do it next dot html. But if I wanted, if I had multiple files and I want to just commit all them other ones, I can just do the period so I'll do that and then get commit and all out of message changing title I breast center. Can you clear this? Okay. And again I do get push and it looks like everything went through. So let's open that up and check it out. I now refresh here and what We haven't seen any changes, but we now see that we have three commits. We have the initial commit the adding background project that Marcy did and it shows you all the files that were added. And if I go back, I have the changing title commit. And now I see that Yeah, Andre just changed the background generator, which is in red to cool generator. So, as you can see, we have a history of all the changes. And we can always go back if there's any mistakes. But there's one issue right now. If I go back to the code and I go to Marcy's computer, I see that well, she still has background generator here. Why is that? Well, because her computer doesn't know that Get hub has been updated. The next command I'm going to show you this is the last one I'm gonna show you in this video is get cool. So remember, get pushed to push the changes to get hot dot com and get pull to pull whatever is the latest. So I do get pull And there you go. You see over here that it shows me that index dot html file was was changed. Now you see that my title has been changed to Cool Generator. Let's just say that Marcy saw my first change and she really, really likes how I've added Cool Generator. But I think she wants to make it capitalized again. She's going to save that. She's going to say, Get status. All right, I have my index dot html fall, get ad, then get commit and all of the message cap a tow lies title. Then get push there you again. I go back, I refresh. And now there's for commits and we see that capitalized title is the new changes. The first day of work is done. I come into the next day of work and well, I wanna start with whatever the latest project is over. Back on, generator on. Let's say Marcy worked all night to change that title to cool capitalized. I want to make sure that I have the most updated version. So what I do is when I get into work in the morning I'll say. Well, I want to make sure that if there's any changes that Marcy made, I know about them. So I'm gonna say, get pool and notice here How the titles going to change after I do the pool. And now I clicked the sublime tax. And there you go. Cool generator. All right. In the next video, we're gonna expand on this and show you what happens if both Marcy and Andre make the same changes. What does get? Have do? I'll see on that one, but by 2. Git + Github Part 2: Welcome back. Let's continue from our previous video to talk about a more advanced workflow and get and get up. Now, up to this point, both Marcy and I have just been working on over here. Branch Master, What does that mean? Well, it says branches, but I only see master here, and you might have noticed one issue with the way that we were doing things. That is, if it's my first day on the job and I just changed the title. But maybe we don't even want that change. Maybe that breaks our branding or breaks our app, but I was able to do it so easily to change it into master. Maybe Marcie didn't even know that I've added that change, and that's a big problem, right? You don't want to put things into what we call production into what the user sees. If it's going to break our website. If you're a big company like Facebook, that could mean millions of dollars in lost revenue. Even if you have a bug that lasts a few hours, so I'm gonna show you a more realistic workflow that you'll have. And that is with branching. Show you what I mean, I have over here a visual off. What get is really, really good at. Up until now, we've been working on what we call Master. That is the master branch. Think of the Master Branch as the authority. This is the right way that our app or our website should look. And up until now, when I doubted the cool background title well, I went from background generator to cool generator. And then when Marcie changed into capitalized letters, then we went to here and we just went in a linear fashion from one end to the other to the other to the other. But like I said, that is a bit of a problem. So better thing to do is what we call branching. If I wanted to change the title, I will create a branch and just call it a little feature, for example. And I just work on that branch of my own without affecting the master branch. What the user sees and Onley when it's finished. When Marcie has reviewed it. When we have tested it and everybody on the team's okay, then we bring it back into master and you can see over here with the big feature, you can keep going for a long time on your own branch and on Lee, when you're done, do what we call merge into Master. I'm gonna show you how that works today. Gonna close this and remember our example. We have Marcy's computer here with all the files and we have my computer here with all the false. We both have our workstation set up. And now you see what master in my terminal meets when I'll show you in the notes afterwards how you can have this set up. So it tells you what branch Iran. But we can see that we're both on master. That's my computer. And Marcy's computer is also on master. We want to make sure that we're both up to date with the latest get hub. So Marcy's gonna do get pool, and I'm also going to do get full. And let's say that I'm now working on a new feature and because it's a better workflow, not toe work on master. And this is a good tip. Generally don't work on master. Always branch off. If I do get branch, we'll show me that Well, I only have one branch and that is master. But we can add to it. We can say get branch new or little feature. And now if I do get Branch, I see that I have little feature. But master is highlighted because I'm currently a master. So the way I would go to the little feature branch, I'll say get check out little feature and there you go switch to branch little feature and now I'm on a little feature branch. So what I've done is I've branched off of master and now created little feature. Let's create a bit of a change. I'm going to say in the little feature, we're going to change the current CSS background title to say, this is the background I'm gonna safe here and again. I do my simple work full that we did in the last video. Get status. I see that. Yep. We have the index dot html change for under clear, so we can see. So now that we've made this change, let's do get God and again just get status to make sure everything went through. Yeah, we're ready to commit indexation, Mel. So well did get commit message. Will be changing text. Perfect. Let's clear that. And now again, in order to let get have no off the changes we need to do. Get push so we'll do get push. All right, let's go to get up and see what happened. We see that now we have this yellow bar that just showed up. Says you recently pushed branches. So if I click on this green button here, compare pull request. It shows me what changes 1/2 which is I've changed the title. And here I can lead to Marcie. No saying, Marcy, I've changed the text. What do you think? And I click on create pull request. And now I have my PR and you see here how says merge pull requests. Well, if we go back to our diagram, I've created this little feature. And now I'm saying, Hey, Marcy, I've just done this new change. What do you think? Is it okay for me to merge it into master? And what will happen here? Most likely as Marcy's will come see this pull request, you can see that we're on the pull request stabs so she will be able to see them and seeing Andre just did this change. She'll look through the changes and she'll say, Well, if she likes, this could be like, looks good. She can click on Started review And you know what? She likes this, that she's just going to approve now. Marcie or myself. Usually you don't want to merge your own pull request somebody on the team does. It can now just say March, pull, request, Confirm, Merge! And there you go. Some teams like deleting the branch afterwards so you can just click delete here if I go back to the code. Well, I don't have the branches anymore, cause I just deleted it. But in my master, if I go to index Saudi Schimmel, I see this is the background. So now Marcie can go to her project and say, Get pool And again she has the latest update. Now let's talk about some conflict. Second arise. Now let's see. Marcy wants to change something, and I also change the same thing. And we we get our merge conflict. Let's see what happens. So let's say Marcy wants to change. Create a new feature, saying we'll call this one big feature and she'll say, gets check out or get branch Big feature, she'll say Get check out big feature. And if I do get branch, we see that there's a new branch here. Let's clear that. And she'll say here that she wants to change his back to background color or background generator because all the users are complaining that the title changed and they like the old title. So see you change that She has done the get ad, get commit, reverting back to old title Perfect. And then she's going to do, get push. Let's clear that first, actually, and we do get push. The first time you get this, you might get this error saying that there's no upstream. Um, you just copy the code that they give you here. Perfect. Now, if I go back to back on generator, I see the big feature pull request over here. And just to show you that you can have multiple commits, let's say Marcy decides to Oh, this is me. Marcie decides to add an exclamation point here. She can just say again, she saves this. That's clear. I shall say, Get ad, get commit. You do this a lot. CEO get really, really good to get after working in a company for a while and she'll say, added ex exclamation. Oops. So what I want to do? Get, commit, commit added exclamation. And she'll do get Bush again. Let's go back to get up. If we look at the pull request, well, actually, have both of these verging back to old title and added exclamation and we see over here both of the changes create the pull request. Needs changes, Andre. So while this pull request is out there, I decided to start a new branch cold. Let's just call a conflict for now and I'll do get check out conflict. And now in the Conflict Branch, I decided to change this to just completely remove the cool generator. I say that again. I check my status and index dot html file has been changed. So while this is happening, I get Marcy too merged the pull request. So she's entered into master. Her pro request is in. And now if I go back to my conflict, I do get status and we have to add these. So get ads. Stan, get commit. I'll just do a short message here. Just check and Now, if I go back to master, I have to do get check out master again before I push my changes. I want to make sure that I have the latest version off Master. So I'm not changing anything. I won't have any conflicts, so I'll do get pull to get the latest. And now I go to get check out Conflict Branch and I can do this. Command. Get merge, Master. So I'm saying merge whatever is a master into conflict. Marcy has been working on the big feature and she's merged it. So now Master has the big feature branch. But I've also created another branch and I've been working on my own on the conflict branch and the Conflict branch doesn't know anything about Master. So I'm saying, Hey, whatever Zen Master right now, which includes the big feature that Marcie worked on, Pull it in and make sure that there's no conflict. So I do that. And oh, I get conflict merge conflict and index dot Asian mafia. Now, if I actually click on sublime text let me open this subsidy can see it better. Oh, boy, I get this weird little syntax. It's overwhelming at first, but it's easy to see what happened. Head is where my branches at. And it shows me that here to the end, I don't have the h one anymore. But in the master branch, we have background generator. Now I can talk to Marcy and say, Hey, Marcy, do you want to keep the back on generator title? And she'll say Yes, that was the right thing to do. Don't change the background. Well, in that case, I just remove these lines and remove this and save. Now if I do get status now, okay, we have the modified status here. Let me just make this smaller again so you can see. Let me clear this What we do now is we have to do get ad again cause we made those changes and we have to do get commit, fixing, merge issue. And I forgot the M. Let's try that again. I m conflict fixing merge issue. Let's clear here. Do get status. Nothing to commit, working, treat clean. And if I didn't get push well again, I get this error. But I want to show you this time around. If I do get push, origin, conflict and now works. Let's go back to get Hub, see what sort of things we have. We have the conflict branch, and if we look at the conflict branch now, well, there's nothing changed because, well, I just reverted all my changes. So it's completely empty. There's no changes now. So Marcie would be like, Hey, did you mean to to make this PR? It's empty. I'll see this message on my PR and I can keep going, and that's pretty much the workflow that you'll see in git. I'll leave the commands for you after this, but you see, it's very, very nice to work with. You. Learn a few commands, and as long as you have this visual model of every time you're working on something, you always create a branch. You title it with whatever future you're working on, and every once in a while you wanna pull master and merch master into your branch to make sure that you're not missing out on any updates that other developers or teammates have done. Once you're down with your feature, you make a pull request by doing get push and that pull request. You'll add comments and people were review your file changes, and if they want you to make a few changes, then you can do again. Get Atget commit. Finally make your changes and then you can merge. Pull request. And once that's done, that everybody else on the team there's now a new master. So everybody else on the team should do get pull as well. It does take a bit of time to get used to, but it is a really, really nice workflow to make sure that everybody on the team works on the same file. Same projects without causing any errors and making sure that everybody collaborates well. And that's it. Hope you found this useful. I'll see you in the next one, but by