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 <tjw...@gmail.com> wrote: > 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 > bare = false > logallrefupdates = true > ignorecase = true > precomposeunicode = true > [remote "origin"] > url = g...@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp > fetch = +refs/heads/*:refs/remotes/origin/* > [branch "master"] > remote = origin > merge = refs/heads/master > [branch "dev-d5sim151"] > remote = origin > merge = refs/heads/dev-d5sim151 > [pack] > buildbitmaps = false > [branch "S1385163"] > remote = origin > merge = refs/heads/S1385163 > > I'm in the S1385163 branch and merged in our main branch dev-d5sim151. > I'm now trying to commit the merged changes into the S1385163. > > > Thanks for the links - I'll start reading, I guess. Just wish NB was a > little more forthcoming with what files are having this issue :-( > > Tschuess, > Thomas > > > On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <peter.nabbef...@gmx.de> > wrote: > >> Hi Tom, >> >> are You on Windows? What is the content of Your git config? >> >> Probably these articles provide some helpful information for You: >> https://stackoverflow.com/questions/17683458/how-do-i-commit >> -case-sensitive-only-filename-changes-in-git >> https://stackoverflow.com/questions/52950/how-to-make-git-ig >> nore-changes-in-case >> >> Kind regards >> Peter >> >> >> Am 31.01.2018 um 16:47 schrieb Thomas Wolf: >> >>> >>> I'm on a defect branch and there have been lots of commits on our main >>> branch since I branched off. Since I'm nowhere near finishing my work on >>> the branch, I thought it might be a good time to merge changes from the >>> main branch into my defect branch. The merge went well - only one file had >>> a merge conflict ("SASSimulation.java") which I resolved. Everything >>> builds and functions as expected. But when I tried to commit everything to >>> my branch, NB throws up an error: >>> >>> "Some files were renamed only by changing the case in their names. You >>> should use a command line client to commit this state, the Netbeans IDE >>> cannot handle it properly." >>> >>> I can definitely try and use the 'git' commands (I'll have to figure out >>> which options :-), but what files is NB talking about? There's no list of >>> offending files. The "Commit Message" doesn't make much sense to me either >>> - it seems to still have the original merge conflict in SASSimulation.java >>> - which I resolved and which had nothing to do with the name of the file (I >>> highlighted the file in commit list just to point it out.) >>> >>> Any help would be much appreciated. >>> Tom >>> >>> >>> -- >>> tjw...@gmail.com <mailto:tjw...@gmail.com> >>> http://landofwolf.blogspot.com/ >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: users-unsubscr...@netbeans.apache.org >>> For additional commands, e-mail: users-h...@netbeans.apache.org >>> >>> For further information about the NetBeans mailing lists, visit: >>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >>> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: users-unsubscr...@netbeans.apache.org >> For additional commands, e-mail: users-h...@netbeans.apache.org >> >> For further information about the NetBeans mailing lists, visit: >> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >> >> > > > -- > tjw...@gmail.com > http://landofwolf.blogspot.com/ >
