Day 11 - Mastering Git and GitHub for DevOps Engineers: Part 2  (Dec 7, 2023)

Day 11 - Mastering Git and GitHub for DevOps Engineers: Part 2 (Dec 7, 2023)

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-01

  • 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

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

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

Task-03

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

  • 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

Task-01: Applying Git Stash

Let's tackle the first task, which revolves around using Git stash to manage changes across branches.

Solution:

  1. Create a new branch and make changes:

     git checkout -b feature-branch
     # Make necessary changes to files
    
  2. Use git stash to save changes:

     git stash
    
  3. Switch to a different branch, make changes, and commit:

     git checkout other-branch
     # Make changes
     git commit -m "Commit on other-branch"
    
  4. Use git stash pop to apply stashed changes:

     git stash pop
    

Now, your changes from the initial branch are applied on top of the commits made in the different branch.

Task-02: Reflecting Commits in Production Branch

This task involves adding specific lines to a file in the development branch and ensuring those changes reflect in the production branch.

Solution:

  1. Add lines to version01.txt in development branch:

     # Edit version01.txt as instructed
     git add version01.txt
     git commit -m "Added feature2.1 in development branch"
    
  2. Add more lines and commit in development branch:

     # Edit version01.txt as instructed
     git add version01.txt
     git commit -m "Added feature2.2 in development branch"
    
  3. Complete Feature 2 in development branch:

     # Edit version01.txt as instructed
     git add version01.txt
     git commit -m "Feature2 completed"
    
  4. Rebase production on master to reflect commit messages:

     git checkout production
     git rebase master
    

Now, your production branch includes all the commit messages from the development branch.

Task-03: Optimizing Features in Production

The final task revolves around cherry-picking a commit into the production branch and making additional changes.

Solution:

  1. Cherry-pick the commit into production:

     git checkout production
     git cherry-pick <commit_hash_of_"Added_feature2.2_in_development_branch">
    
  2. Resolve conflicts and add more changes:

     # Resolve conflicts if any
     # Edit version01.txt as instructed
     git add version01.txt
     git commit -m "Optimized the feature"
    

You've successfully cherry-picked a commit into the production branch and optimized the feature.