DevOps(Day-12) - git & gitstach


Suppose you are implementing a new feature for your product. Your code is in progress and suddenly a customer escalation comes. Because of this, you have to keep aside your new feature work for a few hours. You cannot commit your partial code and also cannot throw away your changes. So you need some temporary space, where you can store your partial changes and later on commit it.

In Git, the stash operation takes your modified tracked files, stages changes, and saves them on a stack of unfinished changes that you can reapply at any time.

Commands:-

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

  2. You can use "git stash pop" to retrieve the file in another branch after committing the priority file to a required branch.

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

Suppose you are working with a team of developers on a medium to large-sized project. Some changes were proposed by another team member and you want to apply some of them to your main project, but not all. Managing the changes between several Git branches can become a complex task, and you don't want to merge a whole branch into another branch. You only need to pick one or two specific commits. To pick some changes to your main project branch from other branches is called cherry-picking.

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.

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.

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 Dev branch Cherry pick Commit “Added feature2.2 in production 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

Thank you very much for reading my article.

Have a nice day.

Comments

Post a Comment

Popular posts from this blog

DevOps(Day-97): Meta-Arguments in Terraform

Image
  TABLE OF CONTENTS Write about meta-arguments and their use in Terraform. Task-01: Meta-Arguments HandsOn Count for-each When you define a resource block in Terraform, by default, this specifies one resource that will be created. To manage several of the same resources, you can use either count or for_each, which removes the need to write a separate block of code for each one. Using these options reduces overhead and makes your code neater. count is what is known as a ‘meta-argument’ defined by the Terraform language. Meta-arguments help achieve certain requirements within the resource block. Write about meta-arguments and their use in Terraform. Meta-arguments in Terraform refer to a set of special arguments that can be used to define how a particular resource or module behaves within a Terraform configuration. These arguments provide additional configuration options and enable fine-grained control over the behaviour of resources or modules. Meta-arguments are prefixed with the...
Read more

DevOps(Day-95): Auto Scaling with Terraform

Image
  TABLE OF CONTENTS Understanding Scaling Pre-requisites Task 1: Create an Auto Scaling Group Task 2: Test Scaling Yesterday, we learned how to AWS S3 Bucket with Terraform. Today, we will see how to scale our infrastructure with Terraform. Understanding Scaling Scaling is the process of adding or removing resources to match the changing demands of your application. As your application grows, you will need to add more resources to handle the increased load. And as the load decreases, you can remove the extra resources to save costs. Terraform makes it easy to scale your infrastructure by providing a declarative way to define your resources. You can define the number of resources you need and Terraform will automatically create or destroy the resources as needed. Pre-requisites Create a  terraform.tf  file declaring the providers to be installed in the system according to the resources required. Create a  provider.tf  file to declare the region. Create a  vp...
Read more

DevOps (Day-1) Introduction

Image
  TABLE OF CONTENTS Infrastructure Automation Why DevOps is Important? What is DevOps? As the name indicates:- Dev + Ops = Development + Operations. Development i) Backend Developers ii) Front-end Developers iii) QA Operations i) System admins ii) Network admins iii) Database admins The practice of operations and development engineers participating together in the entire service lifecycle through a pipeline from design through the development process to production support. This process is known as DevOps. This is a process of automating the whole infrastructure. Now here comes a query, what are we automating? We are automating the whole team's work from the code-building stage to code deployment. Scenario 1:- In a company, there is a project in which developers are writing the code and deploying it to the QA environment frequently for each sprint. This code is then tested by the testing team. Suppose there is a situation of mishap happens where the testing team used the older code ...
Read more