How to merge a specific directory or file in Git

Think of the following scenarios:

There might be two branches with active development and one of the branch needs some specific (updated) file or directory.
You don't want to merge the complete branch but just need some specific file(s).

Similarly, there might be 'n' no. of scenarios where the common theme is that instead of merging the complete branch, all you need to do is merges specific file(s)/directory(s).

Using a smart trick which I like to call 'Selective checkout' can do the intended job

git checkout destination
git checkout source sub-directory/
git commit -am "Message."
git pull --rebase
git push

Using this git terminal trick now you can actually perform specific file/directory merge without merging the complete branch.

How to merge a specific directory or file in Git

Comments

Express Ideas

Streamlining Your Databricks Environment Setup

More from this blog

How to Supercharge Your Streaming Data Pipeline in Python

Why Using SQL for Data Application Development Might Be a Mistake

From Failure to Flow: How I Used Polars to Conquer Memory Issues in Our Data Pipelines

How to effectively work with Databases in Python

Streamlining Your Databricks Environment Setup

Command Palette

Comments

Express Ideas

Streamlining Your Databricks Environment Setup

More from this blog