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

The primary function of a communication system is to transfer a message signal from a sender to the receiver. In the process of data transfer, the signal used to transfer the data should have the necessary properties required for the transmission as per the transmission channel. Hence, there are some information coding techniques used to transform the message signal into a transferrable signal through the transmission channel. Two of such information coding schemes are Huffman Coding and Shannon Fano Coding. The most basic difference between Huffman Coding and Shannon Fano Coding is that the Huffman coding provides a variable ... Read More

In software development, there are several software development life cycle (SDLC) models available. Each of these models follows a set of phases that are unique to its type to ensure the successful software development. This article is meant for explaining the two software development life cycle models that are Agile Model and Waterfall Model. In this article, we will also discuss the important differences between the agile model and the waterfall model. What is Agile Model? Agile model is the type software development life cycle model which allows the continuous interaction of the development and testing during the ... Read More

In this post, we will understand the difference between waterfall model and spiral model −Waterfall ModelIt works in sequential method.The errors and risks are identified and rectified after the stages are completed.It is generally used by customers.It can be used with small projects.The requirements and early stage planning is important and required.It is not flexible.It is difficult to make changes in a waterfall model.It involves a high amount of risk.It is comparatively less expensive.Following is the representation of Waterfall Model −Spiral ModelIt works in evolutionary method.The errors and risks are identified and rectified before the stages are complete.It is generally ... Read More

COCOMO 1 and COCOMO 2 are two cost estimation models, developed by Barry Boehm. These two cost estimation models are used for computing the cost of software development. The most basic difference between these two models is that the COCOMO 1 model helps to provide the estimates required for the efforts and schedule, whereas the COCOMO 2 model provides the estimates that represent a standard deviation near the most likely estimate. Read this article to learn more about the COCOMO 1 and COCOMO 2 models and how they are different from each other. What is COCOMO 1? COCOMO 1 was the first model developed ... Read More

SIT and UAT are two types of testing methodologies, commonly used in software development. SIT (System Integration Testing) is used for testing the interfaces between different modules of the system such as software, hardware, etc. In contrast, UAT (User Acceptance Testing) is used to perform testing from the user end view to validate the product. In UAT, the system is tested for user’s requirements. Read this article to find out more about these two testing methodologies and how they are different. What is SIT? System Integration Testing (SIT) is a type of software testing which is performed in an ... Read More

In this post, we will understand the difference between test plan and test strategy −Test PlanIt is a document prepared for a software project that defines the approach, scope, and intensity required for software testing.It can be changed.It happens independently.It describes the details.It is only done by the test administrator or test manager.It is generally utilized at the project level.Its objective deals with how and when to test the product or system, and who would confirm it.Test StrategyIt is a set of instructions that explain the test design.They also help determine how the test has to be performed.It can’t be ... Read More

The most basic difference between cohesion and coupling is that coupling is the representation of relationships between modules which uses the concept of inter−module, while cohesion is the intramodule representation of the relationship between modules. Read this article to find out more about Cohesion and Coupling and how these two important concepts are different from each other. What is Cohesion? In computer programming, cohesion is an indication that shows the relationship within modules. Cohesion provides the information about the functional strength of the modules. The greater the cohesion, the better will be the program design. Cohesion is basically the dependency ... Read More