#15 Git: merging conflicts in git
This post gives the basic idea to solve the conflicts and then merge them. Also introduces some important commands, which helps us to maintain the git branches.
This post gives the basic idea to solve the conflicts and then merge them. Also introduces some important commands, which helps us to maintain the git branches.
Post consist of pretty basic command regarding creating new branches, switching between this branches, and merging the two branches.
In this post we will see what is alias in git and how to use it. Also we will see what are the various usage of alises by examples. So to explore the post click on read button now.
In this post you will learn how to create github repository. Also how to add remote repository using git commands. We will push our code after creating the remote repository on github.
In this post you will get to see how you can unstage the staged file. Also you will learn how we can unmodify the files using git commands. You will learn how to get previous committed files.
In this post you will learn how you can view the previous commits also you will get to see that how you can change the git commit messages.
In this post we will get to see the commands with which we can remove and rename the git files. We can also remove them from tracking area using git command.
In this post you will learn how you can directly commit your files without adding them into staging area. Git provides shortcut command to do so.
In this post you will see how to do comparison between staging area, working directory and previous commit. Also you will get to know the options we can use with git diff command.
In this post you will learn how to ignore unnecessary files and folders which are created in the background while the software or application is running.