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, e
El martes, 30 de enero de 2018, Thomas Wolf escribió:
>
> Our group creates a lot of branches - one for each bug we fix. For a
> given bug we start off creating a local branch. When it's fixed, I push
> the branch to our server so testing can verify it. At that point, NB
> offers to track the
El miércoles, 31 de enero de 2018, Thomas Wolf escribió:
>
> 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 i
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 wr
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 wil
