Re: Need help understanding NB error message on git commit

Hi Tom, at this point You'd really better use the Git Bash. I had a similar hell using Eclipse, even loosing some changes - the IDEs can provide only limited support, as they usually still rely on git itself, filtering some "spam" usually not interesting. If You're in an unusual situation,

Re: Need help understanding NB error message on git commit

Ok, what the he11 just happened. I did a "Revert Modifications" to undo the merge in my defect branch, but now NB shows the word "Merged" in the version label next to the project - no matter which branch I switch to subsequently??? See attached screen shot. Is this a NB bug or something I did

Re: Need help understanding NB error message on git commit

Hi Peter, The remote repository server is Linux based. It's maintained by a different group, so I don't have access to their git config file. I think at this point I will revert the merge and do as you suggest: simply find the file name diffs - easy enough to do with 'find'. Thanks. Maybe I

Re: Need help understanding NB error message on git commit

Hi Tom, if Your repository has been created before moving to Mac, this might cause problems. I don't know, what "ignorecase = true" actually does - it's not in my git config. From reading, it seems to just suppress checks on diffferent case, so shouldn't hurt too much. Did You check the

Re: Need help understanding NB error message on git commit

Oh and I also realized the my title isn't quite right: it's not on the GIT commit that this error occurs - it's when I bring up the commit DIALOG. The error message is already there before I ever try to hit the "Commit" button on that dialog. Tom On Wed, Jan 31, 2018 at 3:49 PM, Thomas Wolf

Re: Need help understanding NB error message on git commit

Oh, I never mentioned: I'm on NB 8.2 from netbeans.org. Running Java 1.8.144 and git is at version 2.14.1. tom On Wed, Jan 31, 2018 at 3:47 PM, Thomas Wolf wrote: > Hi Peter, > This is a pretty new machine. I'm on the latest macOS (10.13.2), and it > runs Apple's newest

Re: Need help understanding NB error message on git commit

Hi Peter, This is a pretty new machine. I'm on the latest macOS (10.13.2), and it runs Apple's newest files system APFS. We created this repository some 9 months ago and I've done plenty of commits, pushes, pulls without problem. The only time I've seen this message before is when I was on

Re: Need help understanding NB error message on git commit

John, what do you think I'm trying to do by asking? :-) I have no idea what files NB is complaining about - my commit after the merge included dozens of files (many of them data files, not source code). I checked the IDE log and don't see any messages at all when I right-click

Re: Need help understanding NB error message on git commit

Hello Tom, sorry, but I don't have a Mac, so I cannot reproduce Your issue. Which file system does Your Mac use? I've found this on Wikipedia: https://en.wikipedia.org/wiki/HFS_Plus Especially this sentence might give a hint - or probably not: "Additionally, the core of the filesystem uses

Re: Need help understanding NB error message on git commit

Thomas, If you can narrow down the issue, and solve it, maybe file a defect in JIRA, your scenario/investigation might help someone that works on that defect. Regards John On 31 January 2018 at 19:36, Thomas Wolf wrote: > Hallo Peter, > I'm on a Mac (I'm guessing you ask

Re: Need help understanding NB error message on git commit

Hallo Peter, I'm on a Mac (I'm guessing you ask because of the case sensitivity issue with Windows?). The relevant parts of my gitconfig (it's quite lengthy because of all the defect branches, so I'm not going to send the whole thing): [core] repositoryformatversion = 0 filemode = true