🔶 Git Stash:

Git stash is a command that allows you to temporarily save changes you have made in your working directory, without committing them. This is useful when you need to switch to a different branch to work on something else, but you don't want to commit the changes you've made in your current branch yet.

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.

🔶 Cherry-pick:

Git cherry-pick is a command that allows you to select specific commits from one branch and apply them to another. This can be useful when you want to selectively apply changes that were made in one branch to another.

To use git cherry-pick, you first create two new branches and make some commits to them. Then you use the git cherry-pick <commit_hash> command to select the specific commits from one branch and apply them to the other.

🔶 Resolving Conflicts:

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

🔶 Task-01

• 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.

    git checkout -b development
    vim version01.txt
    git add .
    git commit -m "New version file commited"
  

  

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

    git stash list
    git stash pop
    git add .
    git commit -m "git stash file commited"
    git log --oneline
  

  

🔶 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.

    git checkout dev
    vim version01.txt
    cat version01.txt
    git add version01.txt
    git commit -m "New commited file on dev"
  

  

• Line2>> After bug fixing, this is the new feature with minor alterations”

  Commit this with the message “ Added feature2.1 in development branch”

    vim version01.txt
    git add version01.txt
    git commit -m "Added feature 2.1 in development branch"
  

  

• Line3>> This is the advancement of the previous feature

  Commit this with the message “ Added feature2.2 in development branch”

    vim version01.txt
    git add version01.txt
    git commit -m "Added feature 2.2 in development branch"
  

  

• Line4>> Feature 2 is completed and ready for release

  Commit this with the message “ Feature2 completed”

    vim version01.txt
    git add version01.txt
    git commit -m "Feature2 completed"
  

  

• All these commits messages should be reflected in the Production branch too which will come out from the Master branch (Hint: try rebase).

    git checkout -b prod
    git rebase dev
    git log --oneline
  

  

🔶 Task-03

• In the Production branch Cherry pick Commit “Added feature2.2 in development branch” and added the below lines in it.

    git cherry-pick aad3b7d
  

• The line to be added after Line3>> This is the advancement of the previous feature

    vim version01.txt "This is the advancement of previous feature"
    git add version01.txt
    git commit -m "Advancement feature"
  

  

• Line 4>>Added a few more changes to make it more optimized.

• Commit: Optimized the feature

    vim version01.txt "Added few more changes to make it more optimized"
    git add version01.txt
    git commit -m "Optimized the Feature"
  

  

Stay in the loop with my latest insights and articles on cloud ☁️ and DevOps ♾️ by following me on Hashnode, LinkedIn (https://www.linkedin.com/in/chandreshpatle28/), and GitHub (https://github.com/Chandreshpatle28).

Thank you for reading! Your support means the world to me. Let's keep learning, growing, and making a positive impact in the tech world together.

Linux Devops #Devopscommunity #90daysofdevopschallenge