On Sat, Mar 09, 2013 at 02:51:16AM +0400, Konstantin Khomoutov wrote: [...] > I recall someone appearing here sharing their similar frustration with > Git not doing file-level merging when bringing in "upstream" changes, > with automatically making untracked files tracked, if the same-named > files appear in the upstream's changes. I think the discussion was > inconclusive as there are valid arguments against this approach.
Found it: http://groups.google.com/group/git-users/browse_thread/thread/2e654a307b580973 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.