Data Structure
Networking
RDBMS
Operating System
Java
MS Excel
iOS
HTML
CSS
Android
Python
C Programming
C++
C#
MongoDB
MySQL
Javascript
PHP
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 diagram shows a file named File1.txt within the git repository. A, B, C and D represent lines that are added to the file. The diagram indicates that a commit is performed after adding each line A, B and C. c1 is the commit performed after adding line A, c2 is the commit after adding line B and C3 represents the commit after adding line C. Now add line D. This change is available in the working directory and this change is staged but yet to be committed.Now if we perform a hard reset to move the HEAD pointer of ... Read More
In this article, we will create a simple user sign-up form having some parameters. On clicking SAVE, all the user details will be saved in the MongoDB database.InstallationBefore proceeding to create the sign-up form, the following dependencies must be succesfully installed on your system.Check and install express by using the following command. Express is used to set middlewares to respond to HTTP requestsnpm install express --saveSetup the "body-parser" node module for reading the HTTP POST data.npm install body-parser --saveSetup "mongoose", as it sits on top of Node's MongoDB driver.npm install mongoose --saveExample 1Create the following files and copy paste the ... Read More
ReactJS and NodeJS both are a widely used subsets of JavaScript nowadays with high performance. But both are different in someways. In the below article, we will discuss the difference between the two and which is better to use to build a web application and why ?NodeJSIt is a completely open-source and cross-platform runtime environment used for executing JavaScript code outside of a browser.The event driven model of NodeJs lets the user to create a fast and scalable network applications. First thing to remember about NodeJS is that its neither a framework and nor a programming language. NodeJS is a ... Read More
In this post, we will understand the difference between top-down integration testing and bottom-up integration testing −Top-down Integration TestingIt is also known as incremental integration testing.The higher level modules are first tested after which the lower level modules are tested.Once it is done, they are integrated.The higher level modules are the main modules and the lower level modules are the submodules.It uses stubs to simulate the sub-modules.If the sub-module hasn’t been fully developed, the stub acts like a replacement to it.It is useful in cases where significant defect occurs at the top of the program.The main module is designed first ... Read More
In this post, we will understand the difference between fuzzy set and crisp set −Fuzzy SetIt is understood using vague properties.Fuzzy set can have a progressive transition among many degrees of membership.They are generally used in fuzzy controllers.The elements have the ability to be partially included in the set.They are based on infinite-valued logic.They exhibit gradual membership degrees.There is an uncertainty about the set boundaries.Crisp SetIt can be understood using precise and certain characteristics.Here, the transition is sudden, and well defined, not gradual.The element can either be a member of a set or not, no partial ability given.It has a ... Read More
In this post, we will understand the difference between informed search and uninformed search −Informed SearchThey contain information on goal state.It helps search efficiently.The information is obtained by a function that helps estimate how close a current state is, to the goal state.Examples of informed search include greedy search and graph search.It uses the knowledge in the process of searching.It helps find the solution quickly.It may or may not be complete.It is inexpensive.It consumes less time.It gives the direction about the solution.It is less lengthy to implement.Uninformed SearchThey don’t have any additional information.The information is only provided in the problem ... Read More
We can find the DNS name of the VM from the Azure Portal as shown below from the Azure VM Overview tab.This DNS setting is associated with the Public IP address. To retrieve the DNS settings we first need to retrieve the Public IP details. For this example, suppose we have the Azure VM TestMachine2k16 and we need to retrieve its DNS settings (Assuming you are connected to the proper Azure account and the subscription).$vm = Get-AzVM -VMName TestMachine2k16 $pubip = Get-AzPublicIpAddress -ResourceGroupName $vm.ResourceGroupName | where{$_.Id -match $vm.Name}$pubip variable has the attached Public IP properties. You can retrieve the DNS ... Read More