Netbeans seems to automatically commit merged changes?

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Netbeans seems to automatically commit merged changes?

Thomas Wolf-7

I made some changes on local branch B1 and committed them.
I then switched to 'master' and selected "Git->Branch/Tag->Merge Revision...", selected "B1" from the list of locally available branches and hit "Merge".

I expected to see changed files when I selected "Git->Show Changes", but there were no changes.  But I definitely see the changes & new files from B1 in my master.  It's as if the changes were auto-committed.

On the project node, I do see an updated count of how many things need to be pushed to the remote master.

The (very old) documentation on merges says that changed files still need to be committed (see 

Any clarification is much appreciated.
--
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Netbeans seems to automatically commit merged changes?

Javier Ortiz-2
NetBeans just calls git merge command which commits by default.

https://git-scm.com/docs/git-merge

You could run the commit using the no-commit flag to get the behavior you want. Sadly this is not possible from the IDE. Maybe open a feature request?
Loading...