This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Quite simple to duplicate: Dev 1 - Makes changes and commit/push to remote bare repository Dev 2- Makes changes and commit/push - repository refuses the changes Dev 2 - Pulls the files from repository, conflicts emerge Dev 2 - uses Netbeans conflict tools to resolve conflicts, but even after everything is sorted out, the IDE still marks the conflicts as unresolved. Dev 2 - uses git cmd mergetool to resolve conflict and mark them as resolved Dev 2 - can now push the resolved file. It seens to me it is a bug with the Netbeans IDE that it can't mark the files as resolved. Sorry if I'm missing something. I'm new to Git on Netbeans.
can't reproduce. I did: 1) got the conflict - the file turned red 2) selected the file and invoked Git -> Show Changes. The file appeared red in the versioning view 3) i selected the file and invoked Git -> Resolve Conflicts..., the conflict resolver opened. 4) i resolved conflicts and clicked on OK in the resolver. I accepted the dialog asking me "File ABC is modified. Save it?" by clicking on Yes 5) The file was resolved and turned blue in the versioning view. All "<<<<" and ">>>>" were removed from the file. Please tell me if you did exactly the same or if your steps differ in any way.
These were the exact steps, except that after this one: "4) i resolved conflicts and clicked on OK in the resolver. I accepted the dialog asking me "File ABC is modified. Save it?" by clicking on Yes" The file is still red, even though the conflicts are resolved, and if I try the Git -> Resolve Conflicts, the file can't be opened again, because all the "<<<<" and ">>>>" were removed. It looks as if the IDE doesn't recognise that the file is resolved. This happened in two different computers, one in Windows XP, the other in Windows 7, using a remote repository and cloning from this remote server. The remote repository was empty apart from this project. The project as just a initial Java Web project, we changed some words in the index.xhtml to test Git. The Netbeans is the last version from the website, which was downloaded yesterday and it was a fresh install. Your steps is exactly the way I expected it to behave, been scratching my head over this for the last two days and can't se where it's going wrong.
Can you attach the messages log after step 4)? http://wiki.netbeans.org/FaqLogMessagesFile
Created attachment 119581 [details] Error log
here it is, hope it helps
The log contains: SEVERE [org.openide.util.RequestProcessor]: Error in RequestProcessor org.netbeans.modules.git.ui.conflicts.MarkResolvedAction$1 java.lang.NullPointerException at org.netbeans.libs.git.jgit.commands.AddCommand.run(AddCommand.java:116) at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:68) at org.netbeans.libs.git.jgit.JGitClient.add(JGitClient.java:142) This is a known issue... *** This bug has been marked as a duplicate of bug 208617 ***