There are many Git tips and best practices available on the internet that can help you in your day to day activities.
You can save you valuable time, and stay productive with best practices and you can improve your workflow. One of the cool things in the Git is to do parallel programming.
Imagine, you are working on a large legacy project in the Git repo. Some of the time, you have to support the project and other times you have to add new features.
To be honest, this is quite common in many organizations.
Now you cannot switch between branches all the time - it might take quite a long time to complete the switch as it is a large project. And if you do switch via your IDE, it might crash.
Let me share an example. You're in the middle of adding a new feature, and at the same time, a new live bug is reported, which is critical to fix. How do you deal with this?
There are a few ways to achieve such as you can stash your changes. But in this case, one of the best ways is to work on bug fixing and adding new features without switching the branches. And yes, this is possible in Git.
You can use the Worktrees to achieve parallel programming in Git.
What follows is 3 Worktree Git commands so you can achieve parallel programming.
Before that, let's see the basics of worktree. Git worktree command allows you to have multiple working directories associated with one git repo.
A git repository can support multiple working trees, allowing you to check out more than one branch at a time.
Now let's see three Git commands to manage a worktree.
By default you have only one worktree; it is known as the Primary / Main worktree.
And a newly created worktree is known as a Linked worktree.
Before creating a worktree, you can view how many worktrees you currently have. You can use a simple command.
git worktree list
It will display all the worktrees available in your Git repo.
Let’s add a new worktree and see how you can use it.
git worktree add <your_new_work_tree_name>
The above command will create a new worktree. You can confirm it by simply list all your worktrees with the git worktree list command.
Here is an example:
As you can see in the above image, you have two worktrees in the same repo.
Technically at the same time, you can fix some bugs and add new features in the Git repo without checkout in any other branch.
Once you are done with your new feature, you can simply delete your worktree with a simple command.
git worktree remove <your_worktree_name>
Git is a powerful version control system. There is no doubt that with Git Best Practices, you can improve the git workflow and overall efficiency.
By default, there is only one working directory with your repo. And with the help of Git Worktree, you can have multiple working directories. In Linked working trees, you cannot have the same branch name-checked out.
With these simple commands, you can achieve parallel programming.
Let me know your thoughts!