{"thread":{"id":"17211","subject":"mergetool ignore","startedAt":"2009-01-16T20:19:30Z","lastAt":"2009-01-16T20:19:30Z","messageCount":1,"participants":["Caleb Cushing"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"100769","messageId":"81bfc67a0901161219l23877df8xf1707aaf9e83bcb3@mail.gmail.com","threadId":"17211","inReplyTo":null,"subject":"mergetool ignore","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-01-16T20:19:30Z","receivedAt":"2009-01-16T20:19:30Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"is there any way to tell git to ignore merging certain files? I've got\nfiles that have the same name in each directory. but I can't merge\nthem with an editor... it'd be easier to be able to ignore them with\ngit mergetool... and handle them manually.\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"}]}