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.
| Summary: |
Mixed usage of command-line git and NetBeans during rebase causes troubles with `git rebase --continue` |
| Product: |
versioncontrol
|
Reporter: |
pekarna <pekarna> |
| Component: |
Git | Assignee: |
Ondrej Vrabec <ovrabec> |
| Status: |
RESOLVED
INCOMPLETE
|
|
|
| Severity: |
normal
|
CC: |
git
|
| Priority: |
P3
|
|
|
| Version: |
7.0 | |
|
| Hardware: |
All | |
|
| OS: |
Linux | |
|
|
Issue Type:
|
DEFECT
|
Exception Reporter:
|
|
|---|
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