Version Control Systems

Question 1

Version Control System

Answer 1

• Allows you to track and manage code changes
• Allows you to save history of changes to code
• To go back to previous versions
• To work with different branches at the same time and merge changes from different branches

Question 2

How to use git

Answer 2

• Console Interface
• Graphical Interface
• IDE Integration
• Repository Hosting Service

Question 3

Console Interface

Answer 3

• Working with git is done via command line
• Most powerful and flexing but requires knowledge of commands & basic concepts of git

Question 4

Graphical Interface

Answer 4

• Works with git that facilitates interaction with VCS. Allows you to perform basic operations with git directly from development environment

Question 5

IDE Integration

Answer 5

• In-built git support that allows you to perform basic operations with git directly from development environment

Question 6

Repository Hosting Service

Answer 6

• Online services gives you the ability to store git repositories on the cloud.
• Allow you to work without installing it on the local computer.

Question 7

Revision Git: How are changes merged; conflicts and how to resolve them?

Answer 7

• Changes are merged using the git merge command. You select the branch to which you want to add changes from another branch and run the git merge command also specify the name of the branch you want to add changes from
• Conflicts may occur when changes have been made to same files in both branches. Git can’t decide what to save so it stops the merge process. It is left to the user to resolve this conflict.
• The conflict is resolved when the user manually selects the files where changes are to be made. Uses git add to add the modified file to the service directory and commit it to complete the merge.