Being a WordPress theme and plugin contributor, I often find myself in the position where I have to maintain multiple versions of a theme or plugin – free and premium. The so-called freemium model works well but it has a few downsides. One of them is that you need to maintain 2 codebases that share …

Read more →“How to Cherry Pick a Commit from One Repository to Another in Git”

See how to combine two commits into one in Git by using interactive rebase, Git bash, and Vim In our last tutorial, we showed you how to delete a commit in Git, so it does not appear in the Git history anymore. Here, we will examine a similar approach to merge different small commits into …

Read more →“How to Combine (Squash) Multiple Commits into One in Git”

See how to remove commits from the Git history like a pro by using the powerful interactive rebase method. This tutorial assumes you have basic experience with Git. Sometimes you can make a commit in Git and you might later reconsider. Perhaps you made a commit that contains code changes that you do not need …

Read more →“How to Delete a Specific Commit in Git Bash and Vim”