From: Daniel Jacobs <hidden> Date: 2016-06-15 22:46:23
Our project has two main branches set up, one called 'development, and
another called 'production'.
Each branch has a file in it called database.yml, (this is a rails project)...
The development branch and the
production branch are supposed to have different versions of this file.
(and not only this file, but other
config sorts of files as well, but this is a good example).
At the same time, when development is ready for deployment, we will do
git checkout production
git merge development
I would like it if every file was merged, except for files that were explictly
excluded from a merge between these two branches. Is there a good way to do
this?
-Daniel
From: Jay Soffian <hidden> Date: 2016-06-15 22:46:23
On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs [off-list ref] wrote:
I would like it if every file was merged, except for files that were explictly
excluded from a merge between these two branches. Is there a good way to do
this?
Please see http://thread.gmane.org/gmane.comp.version-control.git/110488
(Is there a way to exclude user-specified files or directories from
participating in merges?)
I believe it is the same use case, and Junio provided a very detailed reply.
HTH,
j.
On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs [off-list ref] wrote:
quoted
I would like it if every file was merged, except for files that were explictly
excluded from a merge between these two branches. Is there a good way to do
this?