 |
Incidentally, I've removed most of those autotools-generated file from Git (as of 5d4b8d). I might be wrong, but I think the git pull error is due to the fact that these files are now on the .gitignore list. Can you clean your working copy and try pulling again? I don't think that the error will popup again, once you have pulled in the new .gitignore list. |
 |
I removed my old cloned repo, and did a fresh 'git clone'. commit 2f8a5732ee4ed3c89281341bded3c15cbcc548ee. I did a 'autogen.sh/configure/make', and when the next commit comes I will try a new 'git pull' to see if the error is now gone. I checked out the .gitignore in the freshly cloned repo, but not all the files I mentioned seem to be in there ? In fact, the .gitignore seems to be exactly the same as before ? And I may be wrong, but I thought that the whole purpose of the .gitignore file was that the files that are listed in there are *not* tracked/watched by git anymore, so it doesnt matter if these are in your repo and what version (modified or not) they are when you 'pull' (or 'commit', for that matter) ? Oh, well. I'm not an expert here. I will let you know how it goes the next time I do a 'git pull'. |
|
|
Your .gitignore file looking unchanged appears strange to me, I definitely added stuff to the ignore list, see this commit: https://github.com/codereader/DarkRadiant/commit/5d4b8d87ceb465eea03b0af356237d63ea6a9f36 |
|
|
With respect to my '.gitignore' file, I seem to have made a mistake; it appears exactly the same as the one in the git repo. Sorry for that. Anyway, I did an 'autogen.sh/configure/make', followed by a 'git pull' to get the latest commits, and do not receive the error any more. Which means that this issue can be closed. Thanks for looking into it, and fixing the issue. |
|
|
Ok, thanks |
- Anonymous
