Ask Your Question
1

How can we find the code difference between stable and master branches

asked 2014-08-12 10:36:00 -0600

prat gravatar image

updated 2014-08-12 11:21:48 -0600

smaffulli gravatar image

Actually, I am working on a stable branch, but I want have a patch which has already fixed in master branch. So, I wanted to patch it in code as well. But I am getting some module not present error.

So what I am looking for is, to find a way to find the diff between master and stable branches and steps on how to patch my stable version.

Thanks Prat

edit retag flag offensive close merge delete

1 answer

Sort by ยป oldest newest most voted
1

answered 2014-08-12 11:21:28 -0600

smaffulli gravatar image

You need to backport the fix back into your trunk. It's not a trivial question and there is no 'magic button'. You have to work a lot with git to explore the history and fix issues related to backporting.

edit flag offensive delete link more

Comments

1

Hi, In SVN there is a command like, svn diff, to check out all the differences between two revsions, isn't we have something similar in git ? Thanks Pratik

prat gravatar imageprat ( 2014-08-12 15:13:39 -0600 )edit

Yes. Read git documentation, there are good books about how to use it.

smaffulli gravatar imagesmaffulli ( 2014-08-16 11:40:57 -0600 )edit

Your Answer

Please start posting anonymously - your entry will be published after you log in or create a new account.

Add Answer

Get to know Ask OpenStack

Resources for moderators

Question Tools

1 follower

Stats

Asked: 2014-08-12 10:36:00 -0600

Seen: 79 times

Last updated: Aug 12 '14