On Fri, Jan 23, 2015 at 1:14 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Good answer for ".gitignore". In general, you do not "ignore local > changes" to tracked paths. > I assumed Arup would want to ignore more than is in the upstream project, so you'd come up with an appendix to the .gitignore file because that file is rather obvious to find (it's printed when git pull modifies it, 'ls' just find it, you'd not look into .git/info/exclude by chance) Assuming you want to ignore less than the upstream project (delete some lines from .gitignore) it get's tricky in my opinion. Either have a local commit and just use 'git pull' to resolve the conflicts with upstream. The problem then arises if you want to publish your changes (such as pushing your changes and creating a pull request, then you have that commit included, which you maybe don't want to include) Mind, that I am talking about possible work flows to circumvent an assumed problem which would result in problems as described in the first mail. -- 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