git strategy to have a set of commits limited to a particular branch

Posted by becomingGuru on Stack Overflow See other posts from Stack Overflow or by becomingGuru
Published on 2010-03-30T11:19:59Z Indexed on 2010/03/30 11:23 UTC
Read the original article Hit count: 398

Filed under:

git

|

strategy

|

Workflow

|

version-control

I need to merge between dev and master frequently.

I also have a commit that I need to apply to dev only, for things to work locally.

Earlier I only merged from dev to master, so I had a branch production_changes that contained the "undo commit" of the dev special commit. and from the master, I merged this. Used to work fine.

Now each time I merge from dev to master and vice versa, I am having to cherry-pick and apply the same commit again and again :(. Which is UGLY.

What strategy can I adapt so that I can seamlessly merge between 2 branches, yet retain some of the changes only on one of those branches?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about strategy

Strategy Design Pattern -- *dynamic* !!!

as seen on Stack Overflow - Search for 'Stack Overflow'
My application will have different strategies for my objects. What's the best way of implementing that? I would really love the case when we can make strategy classes implementation dynamically loaded from, say, some relational database. Not sure how do that better, though. What's the best approach… >>> More
Oracle's Web 2.0 Strategy for CRM

as seen on Oracle Blogs - Search for 'Oracle Blogs'
Mark Woollen,Vice President, CRM Product Strategy tells listeners how Oracle's Social CRM Applications harness the latest Web 2.0 technology to create highly intuitive and focused applications for sales users today. >>> More
Report: Ubuntu's Linux Retail Strategy Gears Up for 2010

as seen on Internet.com - Search for 'Internet.com'
Linux at retail has been a hit-and-miss proposition for more than a decade. Canonical's new CEO explains her company's strategy for getting desktop Linux into more customers' hands. >>> More
Parametrized Strategy Pattern

as seen on Stack Overflow - Search for 'Stack Overflow'
I have several Java classes which implement the strategy pattern. Each class has variable number parameters of different types: interface Strategy { public data execute(data); } class StrategyA implements Strategy { public data execute(data); } class StrategyB implements Strategy { … >>> More
Algorithm to make groups of units

as seen on Game Development - Search for 'Game Development'
In Age of Mythology and some other strategy games, when you select multiple units and order them to move to some place, they make a "group" when they reach the desired location: I have a Vector with several sprites, which are the selected units, the variables tarX and tarY are the target x and… >>> More