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 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 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:
1️⃣Step1 : Create a new branch and make some changes to it.
git branch
git checkout -b release
2️⃣Step 2 : Use git stash to save the changes without committing them.
git stash
3️⃣Step 3 : Switch to a different branch, make some changes and commit them.
git branch
git switch uat
vim file10.txt
git add file10.txt
git commit -m "10th file added"
4️⃣Step 4 : Use git stash pop to bring the changes back and apply them on top of the new commits.
git stash pop
💼Task-2:
1️⃣Step1 : 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.
Line2>> After bug fixing, this is the new feature with minor alteration
Commit this with message “Added feature2.1 in development branch”
Line3>> This is the advancement of previous feature
Commit this with message “Added feature2.2 in development branch”
Line4>> Feature 2 is completed and ready for release
Commit this with message “Feature2 completed”
vim version01.txt
git add version01.txt
git commit -m "Added feature2.1 in development branch"
vim version01.txt
git add version01.txt
git commit -m "Added feature2.2 in development branch"
vim version01.txt
git add version01.txt
git commit -m "Feature2 completed"
2️⃣Step 2 : All these commits messages should be reflected in the production branch too which will come out from the Master branch (Hint: try to rebase).
git checkout -b production
git rebase dev
git log --oneline
💼Task-3:
1️⃣Step 1 : In production branch Cherry pick Commit “Added feature2.2 in development branch” and added below lines in it
git cherry-pick 5e020e8
vim version01.txt
git add version01.txt
git commit -m "resolveing conflict"
2️⃣Step 2 :
Line to be added after Line3>> This is the advancement of previous feature
Line4>>Added few more changes to make it more optimized.
Commit: Optimized the feature
vim version01.txt
git add version01.txt
git commit -m "Optimized the feature"
📍 Conclusion :
Advance git concepts like git stash, cherry pick, and conflict resolution is essential for any DevOps engineer looking to optimize their workflow. These techniques empower you to manage your codebase efficiently, apply specific changes selectively, and navigate through the challenges of collaboration.
Thank you for reading!
Contact me at :
linkedin: https://www.linkedin.com/in/sutish-pradhan/
E-mail: psutish@gmail.com