Advance Git & GitHub for DevOps Engineers: Part-2

📌 Git Stash

Git stash is a feature in the version control system Git that allows you to save and temporarily store changes that you don't want to commit immediately but also don't want to lose. In when the middle of the work we have to switch to another branch so at the time with the help of git stash we save our previous work but not commit and go to another branch to not lose the previous work and neither commit.

📌 Cherry-pick

Cherry-pick is used to specific changes from one branch into another without merging the entire branch. sometimes we commit accidentally made to the wrong branch. we can switch to the correct branch and cherry-pick the commit to where it should belong.

📌 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-01 Git stash command

Create a new branch and make some changes to it. Use git stash to save the changes without committing them.

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 Git rebase command

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