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.

Bug 205173 - Mixed usage of command-line git and NetBeans during rebase causes troubles with `git rebase --continue`
Summary: Mixed usage of command-line git and NetBeans during rebase causes troubles wi...
Status: RESOLVED INCOMPLETE
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.0
Hardware: All Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-11-16 03:13 UTC by pekarna
Modified: 2011-11-22 12:40 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description pekarna 2011-11-16 03:13:34 UTC 
STR:

1) Have two conflicting branches, branch1 and branch2 branched from branch1.
2) Check out branch2
3) Rebase branch2 onto branch1 (using `git rebase branch1`)
4) Git will inform about connflicts.
5) We want to use NetBeans splendid merging tool, so go to NetBeans and choose on project: Git -> Resolve conflicts
6) Resolve conficts as necessary and click OK; confirm that you want to save all changed files.
7) Go back to command line.  Run `git status` to see the status. Everything seems ok.
8) Run `git rebase --continue`
9) Git will complain:

    $ git rebase --continue
    You must edit all merge conflicts and then mark them as resolved using git add

No matter what I tried, nothing helped.
I even could not figure out what NetBeans did to get it into this state.

When I edit the files by other editor, or even in NetBeans without the merging tool, the rebase can continue normally.



Product Version = NetBeans IDE 7.0.1 (Build 201107282000)
Operating System = Linux version 2.6.24-29-server running on i386
Java; VM; Vendor = 1.6.0_24
Runtime = Java HotSpot(TM) Client VM 19.1-b02
Comment 1 Ondrej Vrabec 2011-11-16 08:24:37 UTC 
I don't quite understand. So are there any conflicts left? What exactly is the problem? That NetBeans forgot to add the conflicted files after they were resolved?
Comment 2 Ondrej Vrabec 2011-11-22 12:40:09 UTC 
Please evaluate