threads / discuss / 17211

mergetool ignore

Subject: mergetool ignore

## tl;dr

One message between Jan 16, 2009 and Jan 16, 2009.

replies: 0people: 1as markdown or json

Caleb Cushing· Jan 16, 2009, 20:19 UTC · lore

is there any way to tell git to ignore merging certain files? I've got files that have the same name in each directory. but I can't merge them with an editor... it'd be easier to be able to ignore them with git mergetool... and handle them manually.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.