Git

Git

Submitted by Rajasekhar on Sun, 11/11/2018 - 10:48

Git is a version control system for tracking changes in computer files and coordinating work on those files among multiple people. It is primarily used for source-code management in software development, but it can be used to keep track of changes in any set of files.

Tags

How to resolve Merge Conflicts?

Submitted by Rajasekhar on Sat, 11/10/2018 - 13:28
  1. Sometimes, automatic merges will not be possible due to changes having been merged into the repository that our changes conflict with. To fix this, we need to follow the conflict resolution workflow.
    • Initiate the merge process using the Git merge command.
    • Manually choose which changes to merge into the master branch.
    • Commit the resolved merge changes to the repository.
  2. Conflicts arise if two branches edit the same part of the same file. Git can’t resolve the merge automatically.
Tags

What is Version Control System?

Submitted by Rajasekhar on Sat, 11/10/2018 - 11:06

It Tracks and records changes to files over time. Contains extra information such as date, author, and a message explaining the change. VCS track any type of file, but most commonly used for code.

Benefits of VCS are it can retrieve previous versions of files at any time. Retrieve files that were accidentally deleted. Also, it can be used locally by you, or collaboratively with others.

Tags