GIT

Question 1

What type of version control do you use?

Answer 1

we use git for version control, it is very important in development, even when working alone, it protects us from making mistakes. If error happens, it’s easy to return to known working code version. It gives a more flexible environment on code without worrying about irreversibility.

Question 2

What is Git?

Answer 2

It’s used for managing and tracking changes in source code. It’s designed for both small and large projects, it helps to create efficient collaboration and quick handling of project versions.

Question 3

What is the function of the git clone?

Answer 3

this command makes a copy of a Git repository. It’s the common way for programmers to get a duplicate of a remote repository.

Question 4

What is the function of ‘git config’?

Answer 4

this command is used for configuring the Git installation. We can use it to define various settings such as repository behavior, user information, and preferences.

Question 5

What is a ‘conflict’ in Git?

Answer 5

It happens when the commit to be merged has a modification in the same location as the current commit. Git can’t automatically decide which change should be prioritized in that location.

Question 6

What is a Git repository?

Answer 6

Git repository refers to a place where all the Git files are stored. These files can be stored in the local repository or the remote repository.

Question 7

How can you create a repository in Git?

Answer 7

to create a repository, we create a directory for the project, if it doesn’t exist, we run the command “git init”. By running this command .git directory will be created in the project directory, the directory doesn’t need to be empty.

Question 8

How do you resolve ‘conflict’ in Git?

Answer 8

first, we identify the conflicted files, then we make the preferred changes in those files, we add changes using the git add command, and finally, commit the changes with git commit.

Question 9

What is ‘git status’ used for?

Answer 9

It shows the difference between the working directory and the index, it helps understand a git more widely.

Question 10

Explain Git Workflow?

Answer 10

In GIT, developers use three main areas: the Working Directory (where we edit files), the Staging Area (where changes are prepared for the next update), and the GIT Repository (where finalized changes are stored with project history).

Question 11

What are the advantages of using Git?

Answer 11

It has several advantages, including data redundancy and replication, suitability for various projects, high availability, a single .git directory per repository, effective disk utilization and network performance, and collaboration-friendly features.

Question 12

What are the commands for your version control?

Answer 12

We configure our username and email address using git config. We add one or more files to the staging area with git add. To view the changes made to a file, we use git diff. Checking the state of the working directory and staging area is done with git status. When we want to save our changes to the local repository, we use git commit. Uploading local repository content to a remote repository is achieved through git push. Lastly, to fetch and download content from a remote repository and immediately update the local repository to match, we use git pull.

Question 13

What is the difference between local vs remote repositories? (Git vs GitHub)

Answer 13

Git manages our local repository, while GitHub (or other remotes) serves as a platform for hosting and collaborating, enabling synchronization with a centralized location.

Question 14

What is the difference between commit and push?

Answer 14

git commit “records changes to the repository” , git push “updates remote repository”

Question 15

What is Git stash?

Answer 15

git stash temporarily shelves changes for later use, we can add a message with git stash save "<message>", check stashes with git stash list, and reapply a specific stash using git stash apply stash@{index number}.

Question 16

What is Git stash drop?

Answer 16

This command removes a specific stash item. If we no longer need a particular stash, like stash@{abc}, we can use the command `git stash drop stash@{abc} to delete from the list.

Question 17

How do you see who updated the class file using GIT?

Answer 17

Using “git log” command. Git logs allow to review and read the history of everything that happens to a repository.

Question 18

What is staging in GIT?

Answer 18

The staging area, or “index” in Git, is file that tracks changes for next commit. In the Git workflow, we modify files, selectively stage changes we want in the next commit, and commit to store those changes permanently in Git directory.

Question 19

Simple rules for less merge conflicts

Answer 19

Daily, use “git pull” to update our master branch with the latest changes from web repositories. Merging the master branch into our active branch ensures it stays current, short-lived branches is to reduce the risk of merge conflicts. Long-lived branches may lead to conflicts if multiple developers change the same code. Short-lived branches merged back into the master branch quickly, minimizing conflicts due to less code to consider. Following to the Single Responsibility Principle and using small, modular classes lower the chance of conflicts. This is, part of SOLID software design, improves code quality. Effective communication with team members is crucial. Knowing each other’s tasks helps avoid simultaneous changes to the same code, decreasing conflicts. In case another developer try to modify the same code we working on, collaboration is a must