This is a walk-though article. Covered in this article: Git merging Git rebasing Git merging with squashing commits into one Git merging with fast forwarding commits Deleting old commits Visualizing commits When working with Git branches you need to check if your current feature branch deviated from the main branch (e.g. master) and bring those …
When using Git one inevitably find himself in a position when some work is unfinished yet you need to switch to working on a more urgent change.What do you with the code that’s work in progress? You don’t want to lose what you have started, yet it’s untested, not ready to be committed and will …
Stashing your changes in Git and pull request workflow Read More »
Covered in this article: Git cherry-picking commits from another branch Visualizing commits Cherry-picking commits from another branch Let’s say we have two branches: master and feature1, and we don’t want to merge all the feature1 commits to master, but rather cherry-pick only some of the commits.In our case, we want the second recent one – …
When doing work on feature branches, it’s important to incorporate production-ready commits from master branch as soon as possible.The below walkthtroughs explain the approach. Covered in this article: Git rebasing a feature branch Git rebasing a feature branch when theres’s a conflicting change Interactive rebase Deleting branches Visualizing commits Very useful scenario – grabbing master …
Comparing the current branch to the master – git diff command You can use git diff command with various flags to see either detailed difference between the branches or just a summary. For example, after modifying file2.txt and adding new file3.txt we commit this change on wip2 branch. Then we view the diff summary: ANOther …
This walkthrough will compare the results of different types of merging Our initial state is: we are on wip branch, ahead of master by 3 commits: Use case 1: simple merge We switch to master branch and list the commits Now we tell Git to merge wip onto master Here’s our graph of commits after …
The below walkthrough explains how to cleanup some commits by removing them from the history. You would want to do such drastic action if you need to completely remove a commit, as if it never existed – losing all the edits it introduced. This is our WIP/feature branch, and we will be using rebase to …