What is version control and why is it important?

What is version control and why is it important?

Version control is a system that records changes to files over time. It's important because it allows multiple people to collaborate on projects, keeps track of changes, and helps in reverting to previous versions if needed.

Can you explain the difference between Git and SVN?

Git is a distributed version control system, meaning every user has a full copy of the repository. SVN, or Subversion, is centralized, so there's a single central repository. This affects how collaboration and branching work.

What are some common commands used in Git?

Some common Git commands include 'git init' to create a new repository, 'git clone' to copy a repository, 'git commit' to save changes, and 'git push' to upload changes to a remote repository.

How do I resolve merge conflicts in Git?

To resolve merge conflicts in Git, you need to manually edit the files with conflicts, choose which changes to keep, and then mark the conflicts as resolved using 'git add' before committing the changes.