In part 1 we have covered with few concepts such as Git branching, Git revert, Git reset and many other concepts. Today let us see some more advanced concepts such as stash and resolving conflicts etc.

What is Git Stash?

Git stash is a command that allows developers to temporarily save changes that have not been committed to a branch. It's particularly useful when you're working on a specific task but need to switch to another branch to address an urgent bug or tackle a different feature. Stashing your changes allows you to switch branches without committing to half-finished work.

To use Git stash, you first create a new branch and make some changes to it. Then you can use the command git stash to save those changes. This will remove the changes from your working directory and record them in a new stash. You can apply these changes later. git stash list command shows the list of stashed changes.

You can also use git stash drop to delete a stash and git stash clear to delete all the stashes.

How to Use Git Stash:

Using Git stash is straightforward. Here's a step-by-step guide to get you started:

Make sure your current branch is clean (no uncommitted changes).
Use the command: git stash to save your current changes.
You can stash multiple times, creating a stack of stashes.
After stashing, your working directory is clean, and you can switch branches or perform other tasks.
To retrieve your stashed changes, use git stash apply followed by the stash reference (e.g., git stash apply stash@{0}).
Optionally, you can use git stash pop to retrieve the changes and remove the stash from the stack.

Cherry-pick

Cherry-pick is a Git feature that allows you to choose and apply specific commits from one branch to another. This feature can be particularly useful when you need to pull in changes or fixes from another branch or repository without merging the entire branch.

How to Cherry-Pick a Commit in GitHub:

Using cherry-pick in GitHub is straightforward. Here's a step-by-step guide:

First, ensure you are on the branch where you want to apply the cherry-picked commit.
Navigate to the repository on GitHub.
Locate the commit you want to cherry-pick and click on it to view the commit details.
Click on the "Copy SHA" button to copy the commit's unique identifier.
Return to your local repository and run the following command:

shellCopy codegit cherry-pick <commit-SHA>

Replace <commit-SHA> with the SHA-1 hash of the commit you copied.

Git will attempt to apply the changes from the selected commit to your current branch. If there are any conflicts, you'll need to resolve them manually.
After resolving conflicts, commit the changes.
Finally, push the updated branch to your remote repository on GitHub.

Resolving Conflicts

Conflicts can occur when you merge or rebase branches that have diverged, and you need to manually resolve the conflicts before git can proceed with the merge/rebase. git status command shows the files that have conflicts, git diff command shows the difference between the conflicting versions and git add command is used to add the resolved files.

Task 1

Create a new branch and make some changes to it.

    git checkout -b feature
    git branch
    vim version01.txt
    git add .

Use git stash to save the changes without committing them.

    git stash
    git status

Switch to a different branch, make some changes and commit them.

Use git stash pop to bring the changes back and apply them on top of the new commits.

🔶 Task-02

In version01.txt of the development branch add the below lines after “This is the bug fix in the development branch” that you added in Day10 and reverted to this commit.