JIYIK CN >

This article discusses the workflow of git cherry-pick and git merge commands. We use these two commands to integrate changes from one branch to another branch in the Git version control system. However, some scenarios favor the use of one...

This article will discuss resolving git merge conflicts through git commands. Overview Git has many features which developers can use easily and solve their problems. Among these features of git, merging is the basic aspect that every devel...

This article explains how we can find the most recent common ancestor commit in Git. This comes in handy when you create a branch or merge one branch into another. Without further ado, let’s get into today’s topic. Determine the most re...

This article explains the revert command when a merge conflict occurs git merge . We will also take a quick look at how to undo a git merge that was successful and has been pushed to a remote repository. Recovering a conflicting Git merge I...

This article provides an overview of merging a development branch into the master branch. Often we find ourselves creating a branch outside of the master branch for development. Once we are happy with the changes, we can merge them into mas...

This article describes the process of completing a merge after resolving merge conflicts in Git. We will go through the merge steps, resolve the conflicts, and complete the merge. Complete the merge after resolving conflicts in Git For a si...

This article will discuss merging specific changes from one branch to another. As we know, when merging branches, Git merges all files without exception. You may find yourself in a scenario where you have some commits in one branch and you...

In this article, we will see how to undo a merge in Git. In Git, we merge one branch with another to integrate the changes from the other branch into the current branch HEAD . Sometimes, we may want to undo such a merge. We can use the Git...

Sometimes you may want to reset your changes to a specific commit. Suppose you chose git reset --hard commit id the -p way to reset your changes but forgot --hard the -p flag would discard uncommitted changes on your local system and later...

In this article, we will learn how to revert to a previous commit in a Git repository. Git is a version control system used in collaborative development environments to track changes made to files. Git is used to capture snapshots of file c...

This article will show how to reset a local branch in a local repository to resemble a branch on a remote repository in git. Alternatively, we can discard any untracked changes in the local repository. Often, we have a local branch with som...

Git helps us in many ways when working with shared repositories. We can perform many functions using Git as we can create a new branch, merge a branch, delete a branch as per our requirements. These operations can be done using multiple Git...

In this article, we will discuss git prune the command and its uses. We know that Git is very careful with our data. When we delete data like commits, Git doesn't easily lose them. This can lead to stale data piling up in our machines. This...

In this article, we will discuss exporting a project in Git. We use git archive the command to create an archive file of our Git repository. Such a file combines several files into one. Archive files are convenient for sharing between devel...

Suppose your project has many branches created on your local machine but not present in the remote repository. You can easily delete all local branches that are out of sync with the remote repository, but before that, you may want to check...