Found 56 Articles for GitHub

When we have multiple branches in a git repository, we would need to bring the changes from all the branches to the main line of work that is the master branch. So, if we are currently in master branch and need to see which branches need to be merged, we can use the following commands.$git branch --no-mergedWe would also need to verify which branches are already merged, so that we can delete the unused branches$git branch --mergedExampleLet us create an example to understand how to view the branches that are merged and unmerged. The following diagram shows that there are ... Read More

Fast forward merges can be disabled −At the time of mergingFor the entire repositoryFor all repositories.Disabling fast forward merges has both pros and cons.When we disable fast forward merge, git will perform a merge commit to merge the changes from both the branches. The drawback of merge commit is that it becomes hard to read and understand the commit history, especially when we have many branches. If your team prefers to keep a linear history of branches, then one should go for fast forward merge. Disabling fast forward merge will create merge commits, which pollutes the commit history.The benefits of ... Read More

Let us look at an example of a 3-way merge. In this example, the Feature branch is two commits ahead of the Master branch.Diagram 1Before we merge it with Master, let us say we have added an additional commit to the Master as shown in the below diagram.Diagram 2Due to the commit performed on the Master branch, both our branches Master and Feature are now diverged.This means we have some changes in the Master branch that is not present in the Feature branch. If we perform a merge in this case, Git cannot move the master pointer towards the Feature ... Read More

Fast forward merge can be performed when there is a direct linear path from the source branch to the target branch. In fast-forward merge, git simply moves the source branch pointer to the target branch pointer without creating an extra merge commit.Let us look at an example implementing fast-forward merge.We have a master branch with 3 commits.Next, we create a branch called feature branch. In git a branch is nothing but a pointer to a commit. At this point both feature and master are pointing to the same commit.Now let us switch to the feature branch and do a couple ... Read More

A branch in git is a series of interrelated commits. If two branches follow a non-linear path then they diverge each other. The diagram shows two diverged branches master and feature.Consider the above diagram. Let us assume that both the branches were following a linear path before the initial commit. After the initial commit, the branch master has an independent commit c1 and the branch feature has its own commit c2. As the branches now follow a non-linear path, we can say that both the branches are diverged. Let us see this through an exampleStep 1 − Create an empty ... Read More

Before GitHub existed, all the companies have managed the programming source code in private. It was first introduced as a collaborative platform for developers and now almost all of the storage space online is shared here for collective work. Irrespective of major or minor companies, you will find and can also access all their GitHub accounts and download as well. It can be otherwise termed as a dump store of human knowledge.A common misconception that prevails is that, it is a development tool that is used only for coding and compiling computer languages. But the fact is far from it. ... Read More