Skip to content

Merging selected files from another branch into master

February 18, 2011

Wow, this should really be easier to find…but it took a while to find a quick way of doing this with git…

if you have two branches:

*master
other-branch

You can pull in changes from “other-branch” app/model/customer.rb with:

git checkout other-branch app/models/customer.rb

Then you can do a git commit as per normal.

Based on this article.

Advertisements

From → Uncategorized

Leave a Comment

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: