Git And GitHub (Push, clone, Branch, Head, Merge, Pull Request)

By


Push

A Push is directly related to the commit. Because as you save your progress with commits, you need to have a way to share your work with your team, and here comes a Push. It syncs your local work with the remote repository of your project. You can easily push many commits at once, for example when you don’t have an internet connection, you can still work on your project, create many commits, and when you are back online, you push them all, for your team to see. 

Clone

A clone is what the name suggests, literally a clone of your repository, it includes all information stored within the repo, all files, and the history of changes. It takes the remote repository and creates an exact copy of it on your local machine. 

If you are into clone commands, there is a detailed article describing how to clone a Git repository, and what the pros and cons of such a solution are. 

Branch

You can think of a branch as a safe place for you to work on your code, separately from the main project. This allows your team for safe work on the project because individual bugs and mistakes will only affect the branch you work on and won’t affect the main software stored on the Master Branch. We’ll take a closer look into how to commit changes to another branch later.

While working with git, and using branches you need to know which branch you are working on currently, and that branch is called the “HEAD” branch and is sometimes referred to as an active or current branch. 

Merge

When you think you finished work on your branch, added a new feature, and tested it you would like to include it into the main codebase – the Master branch, or into the branch that is higher in the hierarchy. You basically merge them together. From now on, the new code will be a part of the branch you merged to. 

Fork

A Fork is something similar to the cloned repository. But there is a big difference, instead of cloning the repository on your local machine, a new repository with the same code is created and assigned to you – a fork. This feature is used usually when developers decide to try and go the other direction with the software that already exists, with different ideas to test them in a safe environment, so that the changes don’t influence the main code. You can also merge the changes to the master branch. To learn more, check this post – Git forking workflow. 

Pull Request

A pull request is when you want to pull (merge) branches or forks with all of the changes made within them into the master branch. If the pull request is approved, all the changes made in the branches are now a part of the main software. There is also a possibility that the pull request will not be approved, then the person responsible for merging branches is able to give feedback on why it wasn’t possible, so you can improve and fix the code.

Comments

Post a Comment

Popular posts from this blog

complete CI/CD

By
Image
  What is CI CD Pipeline? CI stands for Continuous Integration and CD stands for Continuous Delivery and Continuous Deployment. You can think of it as a process which is similar to  a software development lifecycle. Now let us see how does it work.  The above pipeline is a logical demonstration of how a software will move along the various phases or stages in this lifecycle, before it is delivered to the customer or before it is live on production.  Let’s take a scenario of CI CD Pipeline. Imagine you’re going to build a web application which is going to be deployed on live web servers. You will have a set of developers who are responsible for writing the code which will further go on and build the web application. Now, when this code is committed into a version control system(such as git, svn) by the team of developers. Next, it goes through the  build phase  which is the first phase of the pipeline, where developers put in their code and then ag...
Read more

Basic Overview Of project and Work

By
Image
Containers are gradually replacing virtual machines and gaining popularity in the IT industry due to their scalability and agility. Containers are built on the concept of operating system-based virtualization. Computing containers are deployed in the cloud as computing instances, whilst on-premises they are deployed using Docker as part of CI/CD workflows utilizing Jenkin Server. When the number of containers increases, so does the deployment and resource management, which is handled by Kubernetes. Kubernetes is used to deploy and manage containers autonomously, and Rancher is used to efficiently manage the Kubernetes Cluster. Initially, an analysis of the scheduler and resource management utilised by Kubernetes to deploy containers is performed, and a framework is proposed to automate the entire process from container deployment to Kubernetes Cluster administration in a scalable manner using helm-charts and ansible scripts. It is a fully automated system for deploying scalable applica...
Read more

Introduction To Docker

By
Image
  What is Docker? Docker is a Linux-based, open-source containerization platform that developers use to build, run, and package applications for deployment using containers. Unlike  virtual machines , Docker containers offer: OS-level abstraction with optimum resource utilization Interoperability Efficient build and test Faster application execution Fundamentally, Docker containers modularize an application’s functionality into multiple components that allow deploying, testing, or scaling them independently when needed. Take, for instance, a Docker containerized database of an application. With such a framework, you can scale or maintain the database independently from other modules/components of the application  without  impacting the workloads of other critical systems. Components of a Docker architecture Docker comprises the following different components within its core architecture: Images Containers Registries Docker Engine Images Images are like blueprints con...
Read more