HERE IS A SIMPLE GUIDE FOR GIT 🙂
Git is a version control system, which makes it easier to track file changes.
For example, git can help you determine exactly what has changed, who has changed it, and why when you edit a file. It’s useful when coordinating developing a program with a team of people on a project, and for tracking progress.
GIT Terminologies
Repository : Central location where all of the files are stored.
Trunk : This is where the most stable code is placed which is called as the production code. ( Also known as master branch)
Stage : Mark files for tracking changes.
Commit : Creates a snapshot of the file changes that are made.
Merge: Combine branches together to update the master branch.
Checkout : Obtain file for changing.
Branch : Copy of the branch master taken at a particular point. All developments in
features and corrections of bugs will be done in a branch. Usually multiple branches are allowed at the same time.
Merge conflict : It happens when a file that has been changed in two separate branches or
places is combined. Changes interfering with other changes.