Keeping that in mind, considering that we are already on the master branch, all we have to do is run the merge command. In this case, we want to merge from our develop branch, where the "develop" file exists, to our master branch. It is important to remember when merging, that we want to be on the branch that we want to merge to. The process of moving code between branches (often from development to production) is known as merging. In our scenario, this file represents any change to any file (or a whole new file) that has passed all testing on our development branch,and is ready to be in production. It's not missing - it's on our develop branch and we are on our master branch. Running "ls" again, it appears that our new file is missing. The output will tell us which branch we are one, indicated by the asterisk. To ensure that we are on the master branch, we can run type the following: The interesting part comes after we switch back to our master branch, which we can do with the git checkout command: The output will show us that both of our files, respectively named "file" and "develop", are found: Running the "ls" command will show us that the two files exist: We learned earlier that the asterisk next to the branch name indicates that we are currently on that branch. The output should appear similar to the following: This file now exists on the develop branch as we're about to find out, it doesn't exist on the master branch.įirst, we are going to confirm that we are currently on the develop branch. We also need to commit this file, which will attach this file to the branch we're currently on, which is "develop". The above set of commands will create a blank file, named "develop", and add it to GIT. We can add the "develop" file, by typing: Just as in the previous tutorial, we need to tell git that we want to track this new file. Until we merge it to the master branch (in the following step), it will not exist there. On this branch, we are going to create a new blank file, named "develop". To illustrate this process, we need to switch back to our develop branch: In our scenario, we are going to use our "develop" branch for testing out our changes and the master branch for releasing them to the public. Now that we have multiple branches, we need to put them to good use. If you try to switch to a branch that doesn't exist, such asĮrror: pathspec 'nosuchbranch' did not match any file(s) known to git. You can switch back and forth between your two branches, by using the git checkout command:Īssuming the branch that you are trying to switch to exists, you'll see output similiar to the following: In the case of a branch by that name already existing, GIT would tell us so:įatal: A branch named 'develop' already exists. To create a new branch, named develop, type the following: git checkout -b developĪssuming we do not yet have a branch named "develop", the output would be as follows: We are going to treat the default "master" branch as our production and therefore need to create a single branch for development, or pre-production. Creating branchesĪs stated in the beginning of this article, we want to have a development and a production setup for our coding environment. Now that we know how to view branches, it time create our first one. The second line simply indicates that on our remote, named origin, there is a single branch, also called master. The asterisk next to "master" in the first line of the output indicates that we are currently on that branch. The output will look similiar to the following: We can view all existing branches by typing the following: git branch -aĪdding the "-a" to the end of our command tells GIT that we want to see all branches that exist, including ones that we do not have in our Prior to creating new branches, we want to see all the branches that exist. This tutorial will teach you how to create two branches (master and develop) and how to merge code from the development stage to production.Ī branch, at its core, is a unique series of code changes with a unique name.Įach repository can have one or more branches.īy default, the first branch is called "master". It's very easy to learn the syntax and to figure out how git can best serve your workflow and your environment. In the world of version control systems, GIT is arguably one of the best in terms of flexbility. Installation article and the article on how to use git effectively. This article is the third installment in the "Using Git" series.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |