On Sat, Mar 28, 2009 at 8:07 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> You can resolve this merge conflict by running >> $ git rm TimeSheets/Timesheet\ Exempt.XLS >> >> which will make git delete the file from your working copy and the >> index, at which point you can then make a commit that does not include >> this file. > > But is this what you really want to do? After doing such a "remove it" > merge resolution at Home, wouldn't merging it back to Work remove the > file? Yes, and I've not told the full story. Each time I do a merge in between the two branches, I have a script that resets certain files that I don't want cross-pollinated between the two branches. Then I do the commit. Most of the time (on non-binary files, and/or on files I only change on the work branch and not on the home branch), this works just fine. My desire to avoid doing the above drove my earlier post asking whether there as a facility to exclude certain files from participating in merges. But the answer was "no" to that, hence my ad hoc workaround above. bg -- 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
