{"thread":{"id":"18313","subject":"excluding files from a merge","startedAt":"2009-03-15T01:23:03Z","lastAt":"2009-03-16T01:45:02Z","messageCount":4,"participants":["Daniel Jacobs","Jay Soffian","Nanako Shiraishi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"108037","messageId":"loom.20090315T011519-497@post.gmane.org","threadId":"18313","inReplyTo":null,"subject":"excluding files from a merge","fromName":"Daniel Jacobs","fromEmail":"djacobs7@gmail.com","sentAt":"2009-03-15T01:23:03Z","receivedAt":"2009-03-15T01:23:03Z","isPatch":false,"sender":{"key":"djacobs7@gmail.com","avatar":null},"body":"Our project has two main branches set up, one called 'development, and \nanother called 'production'.\n\nEach branch has a file in it called database.yml, (this is a rails project)...\n The development branch and the \nproduction branch are supposed to have different versions of this file. \n(and not only this file, but other \nconfig sorts of files as well, but this is a good example).\n\nAt the same time, when development is ready for deployment, we will do\ngit checkout production\ngit merge development\n\nI would like it if every file was merged, except for files that were explictly \nexcluded from a merge between these two branches.  Is there a good way to do\nthis?\n\n-Daniel\n"},{"id":"108046","messageId":"76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com","threadId":"18313","inReplyTo":"loom.20090315T011519-497@post.gmane.org","subject":"Re: excluding files from a merge","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2009-03-15T12:47:30Z","receivedAt":"2009-03-15T12:47:30Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@gmail.com> wrote:\n> I would like it if every file was merged, except for files that were explictly\n> excluded from a merge between these two branches.  Is there a good way to do\n> this?\n\nPlease see http://thread.gmane.org/gmane.comp.version-control.git/110488\n(Is there a way to exclude user-specified files or directories from\nparticipating in merges?)\n\nI believe it is the same use case, and Junio provided a very detailed reply.\n\nHTH,\n\nj.\n"},{"id":"108059","messageId":"20090316071440.6117@nanako3.lavabit.com","threadId":"18313","inReplyTo":"76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com","subject":"Re: excluding files from a merge","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-03-15T22:14:40Z","receivedAt":"2009-03-15T22:14:40Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Jay Soffian <jaysoffian@gmail.com>:\n\n> On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@gmail.com> wrote:\n>> I would like it if every file was merged, except for files that were explictly\n>> excluded from a merge between these two branches.  Is there a good way to do\n>> this?\n>\n> Please see http://thread.gmane.org/gmane.comp.version-control.git/110488\n> (Is there a way to exclude user-specified files or directories from\n> participating in merges?)\n>\n> I believe it is the same use case, and Junio provided a very detailed reply.\n\nWould it help to have the final summary by Sitaram Chamarty\n\n    http://article.gmane.org/gmane.comp.version-control.git/110697\n\nsomewhere under Documentation/howto?\n\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"108063","messageId":"76718490903151845i27984ccaqbfb289eff69f7dc6@mail.gmail.com","threadId":"18313","inReplyTo":"20090316071440.6117@nanako3.lavabit.com","subject":"Re: excluding files from a merge","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2009-03-16T01:45:02Z","receivedAt":"2009-03-16T01:45:02Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Sun, Mar 15, 2009 at 6:14 PM, Nanako Shiraishi <nanako3@lavabit.com> wrote:\n> Would it help to have the final summary by Sitaram Chamarty\n>\n>    http://article.gmane.org/gmane.comp.version-control.git/110697\n>\n> somewhere under Documentation/howto?\n\nI don't think it would hurt. A good explanation of remote tracking\nbranches, local branches, and what --track means might not hurt\neither. :-)\n\nj.\n"}]}