Let's create a Branch, Merge it & Tag a Commit

Lecture 8:- Let's create a Branch, Merge it & Tag a Commit

Let's go step by step to create a branch, merge it back into the main branch, and tag a commit.

Assuming you already have a Git repository set up and you are in the root directory of your project:

Create a Branch: To create a new branch, use the following command. Replace "new-branch-name" with the desired name for your new branch:

This command creates a new branch based on the current branch (usually the main branch, often named "master" or "main").

Switch to the New Branch: To start working in the newly created branch, use the following command:

Alternatively, you can use the shorthand for creating and switching to a new branch in one step:

Make Changes & Commit: Now that you are in the new branch, make your changes to the project files. After making the changes, stage and commit them as usual using git add . and git commit -m "Your commit message here".

Switch Back to the Main Branch: Once you have made your changes and committed them in the new branch, switch back to the main branch using the git checkout command:

Merge the New Branch: Now, you want to merge the changes you made in the new branch back into the main branch. Use the following command to do that:

This command will merge the changes from the new branch into the main branch. If there are any conflicts, you'll need to resolve them before completing the merge.

Tag a Commit: A tag is a way to mark a specific commit as important or significant, like a release version. To tag a commit, use the following command:

In this example, we create a tag named "v1.0" with the message "Version 1.0". Replace "v1.0" with your desired tag name and provide an appropriate message for the tag.

To push the tags to a remote repository (like GitHub) along with the commits, use:

That's it! You've now created a new branch, made changes, committed them, merged the branch back into the main branch, and tagged a commit. These are common actions you'll encounter while working with Git, and they enable you to organize and manage your project's development effectively.

bashCopy code

git push --tags

bashCopy code

git tag -a v1.0 -m "Version 1.0"

bashCopy code

git merge new-branch-name

bashCopy code

git checkout main

bashCopy code

git checkout -b new-branch-name

bashCopy code

git checkout new-branch-name

bashCopy code

git branch new-branch-name