From the course: Designing and Implementing Source Control using GitHub and Azure DevOps
Unlock this course with a free trial
Join today to access over 25,500 courses taught by industry experts.
Merging a pull request in Git
From the course: Designing and Implementing Source Control using GitHub and Azure DevOps
Merging a pull request in Git
- [Lecturer] Recall that a PR is based on merging code from one branch to another. So let's review all the steps to complete a pull request and merge operation. Let us create a new branch from the main branch using the command git checkout -b, and then the name which is going to be feature-pr. This created our branch and checked it out. Now, let us go into Visual Studio Code and make a tiny change. This time, I'm going to make a code change. So let's go to Views, Home, Index and let us change the message to say, Welcome to PR. Once we have made this change, let us commit. We can once again use our Git CLI or we can use the built-in tools for Visual Studio Code. So let us use these tools and state the message, Testing PR Feature, and let us commit and push. Visual Studio Code detects that there is no branch on the remote repository by this theme so we can go ahead and create it. Now, let us go to the remote repository on…
Contents
-
-
-
-
-
-
(Locked)
Understanding Git branches1m 45s
-
(Locked)
Creating a Git branch3m 2s
-
(Locked)
Using pull requests2m 4s
-
(Locked)
Merging a pull request in Git2m 26s
-
(Locked)
Understanding Git merge methods2m 36s
-
(Locked)
Performing a merge and rebase4m 51s
-
(Locked)
Handling merge conflicts3m 30s
-
(Locked)
Git branching strategies2m 16s
-
(Locked)
Using the Git flow branching strategy4m 41s
-
(Locked)
-
-