Posts

Showing posts from May, 2022

Git Merge Rebase and Cherry Pick - deep dive

Image
Hello guys 🙂 this post I would like to share with you about the " git merge " experiments. We have multiple code lines in the project, once the developer completes his task branch is ready to move to the next branch for testing.  Git Merge and git rebase There are multiple ways to combine the code lines. If the HEAD pointed to the tip of the branch then the best way to merge from the other branches into the current branch.  FF fast forward merge  3 Way merge You will be on the target-branch (most of the time it will be main/master or release or production) and then you will run the following command with a source-branch. git merge [branch-name] The following example for the Git Merge 'ort' Strategy, let's begin clear mkdir merge_test; cd merge_test; git init # on main branch two commits touch test1 ; git add . ; git commit -m "test1" touch test2 ; git add . ; git commit -m "test2" # branch out feature and do 2 commits git chec...

GIT Commands reference for DevOps Engineer

Image
Dear DevOps Engineer!! this post is full of experimenting with git commands running most of them on the 'Git Bash' window in my laptop. I've collected three things about each git command. git command syntax What this git command will do - short descriptions An example command that I've executed Screenshot of that command execution How do I Start a Fresh repository in Git CLI(local repo)? You need to create a folder where you would like to start your coding project. The code can be web-site related where you can have multiple directories involved such as HTML files into a folder, all images to be used in the website in a folder, CSS files into a folder, etc. First, make the folder structure for you project then at the root of the project need to initialize the project.  To create empty repo or re-initializing a repo Syntax : git init Note: It is always better to have a fresh directory created and then run the above command to initialize a...

Git File Lifecycle

Image
In this post, we will explore, experiment and see git basic files and folder -related commands if you are familiar with the Linux file system this will be easy for you! But, again no need to worry about that we will see every command execution with experiments. Every software product/server Lifecycle can be visible with their STATUS output, where they are currently if you know then you can move to different Lifecycle state. Let's understand how this navigation happens on the Git repository. Git File lifecycle status changes with commands Git Status Git Status will always compare the files and folders with the indexed with untracked files and display their status.  Syntax: git status [options] This command will check the status of the current branch by comparing it with the master branch Example: git status -s This `git status` command will show the working tree status. and it is having multiple useful options. When you use the -s or --short option it will display the...

Git branching - local and remote

Image
Hello all, in this post specially dedicated to all DevOps/DevSecOps Engineers.  Where their daily routine will have this commands if we know these we can play with them easily if you don't then it will be horrifies you!  Git Branching explained in detailed Prerequisites to this you should be aware git basics and to experiment with these command examples should have git installed on your Mac/Linux or git bash on Windows system. What is the Branch in Git? A Git branch is a separate line of work, where your work will not disturb other DevOps team members work. Branch is a simply a movable  pointer to commit, this we can observe using git branch command output wherever you see that '*' prefixed there the pointer pointing. Default branch is master or main (new trend) but it is optional we can name anything when we initiate the git repository. Main branch is the FIRST branch of your project that means once you run the 'git init' then 'git branch' you can observe t...

Controlling EC2 Instance from CLI: AWS automations

Image
When you start learning few commands about AWS CLI you can plan to automate the process with simple bash shell script where you can include set of aws commands into it with simple bash script controls.  How to automate AWS EC2 stop/start using aws cli? Objective of this post is to develop a simple controlling script which can use the AWS CLI commands for start-instances, describe-instances, stop-instances and adding bash scripting logic to it. First we start experiment with each aws ec2 command, then we can proceed by collecting those successful commands to form a automation script. Let's explore now. How to automate AWS EC2 instance using aws-cli How to start an AWS EC2 instance "start-instances" command To start the aws instance you need to pass the instance-id as argument. Following is the command example. aws ec2 start-instances --instance-id i-instancenumber Please change to your instance-id value replace the instancenumber with yours. Execution output looks like ...