GitHub Interview Questions- Part 2

Answer:

Before completing the commits, they can be reviewed and formatted in the intermediate area called Staging Area or Index.

Answer:

 In such a case, the files stashed and saved in a stash index can be recovered. However, untracked files will be lost. That is why it is prudent to commit and stage your work or stash them.

Answer:

Git stash takes the current state of the index and working directory, puts it in on a stack for later, and provides a clean working directory. So, if you are in the middle of something and you need to jump over to another job, and at the same time, you don’t want to lose your current edits, you can use Git stash.

Answer:

You can use the git stash apply command when you want to continue working on your previous work where you have left. It can bring back the saved changes in the working directory.

Answer:

Git diff is a multi-purpose command that can be used to showcase the differences between two arbitrary commits, the difference between a commit and working tree, changes between an index and working tree, changes between two files, changes between a tree and an index, etc.

The git status is used to inspect the repository. It denotes the state of a staging area and the working directory. It also lists the files that have been staged, unstaged, and untracked files.

Answer: 

‘git remote add’ command only creates an entry in the git config that specifies the name for a particular URL.  Whereas, git clone command creates a new git repository by copying the existing one located in the URI.

Answer:

Git stash drop is a command used for removing the stashed item. It removes the last added stash item by default and can also remove any particular item if you entail it as an argument.

Answer:

The commit object consists of the following parts:

• A set of records showing a task’s condition at a given period;
• References to the parent commit objects;
• SHA-1 name, a 40-character string that uniquely determines the commit object.

Answer:

• Feature branching: A feature branching model keeps changes for a particular feature inside of the branch. When a feature is completely tested and validated through automated tests, the branch is merged into master.
• Task branching: In this branching model, each task gets implemented on its separate branch with the task key included in the branch name. It is easy to determine which code implements which task by analyzing the task key in the branch name.
• Release branching: Once the develop branch has attained all the features for release, you can clone/copy that branch to build a Release branch. Creating the Release branch will start the next release cycle; thus, you can no longer add new features after this stage; only documentation generation, bug fixes, and other release-oriented tasks must go in the Release branch. Once it gets ready to ship, the release will merge into master and tag with the version number. Additionally, it should be merged into the develop branch, which may have progressed since its release.

Answer:

Forking Workflow is different than other popular workflows in Git.  It provides each developer with an individual server-side repository rather than a single server-side that acts as the “central” codebase. The Forking Workflow is most commonly used in public open-source projects.

• A significant advantage of using Forking Workflow is that its contributions can be integrated without needing everyone to push to a central repository that leads to clean project history. Thus, every developer can push to his server-side repositories, but only a project maintainer can push to the official central repository.
• If developers are ready to publish the local commit, they push that commit to their public repository and not the official one. Thereby, they go for a pull request with the main repository that indicates a project maintainer that update is ready to be integrated.

Answer:

 The amend operation destroys a state previously saved in the commit. If a commit message is being changed, then that is not an issue.  However, if its contents are being amended, then the chances of eliminating something important remains more.

Abusing “git commit- amend” results in the growth of small commit and can obtain unrelated changes.

Answer:

The Gitflow Workflow specifies the branching model for Git. It provides a framework for handling large projects that have a scheduled release cycle. Gitflow assigns specific roles to different branches. It defines how and when they should interact:

• Master:It is always ready to be released on LIVE. Mater branch gets released when everything is fully tested and validated.
• Develop: In this branch, all tests are performed, and all features are integrated. When everything is checked thoroughly, it can be merged into the master.
• Feature:Every new feature should reside in a separate branch, which can be pushed to develop a branch as their parent branch.
• Hotfix:These branches are used to quickly patch production releases. They are based on the master than the develop branch.

Answer:

• The workspace or working tree is a directory that contains the source files you are working on currently.
• An index is the staging area where the commits are prepared. It lies between a commit and your working tree. The index is a large binary file that lists all files in the current branch, their names, timestamps, and SHA1 checksums. The file is present at the /.git/index.
• HEAD is the reference to the latest commit in a current checkout branch.

Answer:

The rebasing command in Git is used to integrate changes from a branch to another. It is an alternative to a merge command. The key difference between rebasing and merge command is that rebase rewrites a commit history to produce a straight, linear succession of commits.

Merging means a way of putting a forked history back together. The merge command in Git helps to take independent lines of development created by a Git branch and integrate them into one branch.

Answer:

The differences between revert command and reset command are as follows:

Answer:

The cherry-pick command in Git introduces a particular commit from one branch within a repository into a different branch. It is also used to back-port or forward commits from the maintenance branch to a development branch. In contrast to other ways such as rebase and merge that usually apply many commits onto another branch.

Answer:

The git reflog command is used to record updates made to the tip of branches. It enables you to return to commits even to the ones not referenced by any tag or branch. After rewriting history, the reflog includes information about the previous branches’ state and makes it feasible to go back to that state if required.

Answer:

Below are some key advantages of Git:

• Git enables data replication and data repetition.
• It is an applicable service.
• For a depository, you can have only one Git directory.
• Network performance and disk application.
• It provides collaboration on any project.
• You can work on any plan within a Git.

Answer:

The Git push command is used to push the content in the local repository to the remote repository. After the local repository has been modified, a push is executed to share modifications with the remote team members.

Answer:

To resolve a merge conflict in Git, do the following:

• The simplest way to resolve a conflicted file is to open it, then make the necessary changes.
• After editing the file, you can utilize the git add a command to stage the newly merged content.
• Now create a new commit with the help of the git commit command
• Git will create the new merge commit to finalize the merge.