--- Jakub Narebski <jnareb@xxxxxxxxx> wrote: > Bill Priest wrote: > > > All, > > I have two branches that are slightly different > and > > most changes "belong" in both. There are a > handful of > > files/directories that are disparate. Is there > any > > way in git to tell it not to merge these files? > Kind > > of like .gitignore but for merges. > > Most probably you can use gitattributes for that. > Or you can use 'our' merge strategy. Can you point me to some docs on "our" merge strategy? > > > In addition I'd like a way to specify to > git-merge > > to leave all merged files unrecorded in the index. > > > Then as I go through each file making sure that > the > > merge "makes sense" (not that git did the right > thing; > > but that I want the changes in both branches) that > I > > add the change to the index. > > You can use gitattributes for that. I did man gitattributes and nothing jumped out at me as far as an attribute that I could set/unset that would stop a file from being merged. What am I missing? Bill __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
