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 215235 - git merge creates conflicts if file changed it's location
Summary: git merge creates conflicts if file changed it's location
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.2
Hardware: PC Windows 7
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL: https://bugs.eclipse.org/bugs/show_bu...
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-06 17:29 UTC by fedind
Modified: 2013-02-13 16:55 UTC (History)
1 user (show)

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
IDE log (152.40 KB, text/plain)
2012-07-06 17:30 UTC, fedind 		Details
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 fedind 2012-07-06 17:29:54 UTC 
Product Version = NetBeans IDE 7.2 RC1 (Build 201206272359)
Operating System = Windows 7 version 6.1 running on amd64
Java; VM; Vendor = 1.7.0_05
Runtime = Java HotSpot(TM) 64-Bit Server VM 23.1-b03

Steps to reproduce:
1. Create git branch, switch to this branch, make some changes to any file and commit this changes
2. Switch back to master move previously changed file to another folder and commit changes
3. Merge branch created in step 1 with master branch. Result is confict with deleted file

Expected behavior: merge must add changed from the branch to master moved file like after 'git merge <branch name>' command
Comment 1 fedind 2012-07-06 17:30:00 UTC 
Created attachment 121791 [details]
IDE log
Comment 2 Ondrej Vrabec 2012-07-23 15:00:39 UTC 
i believe this is what we're blocked by: https://bugs.eclipse.org/bugs/show_bug.cgi?id=372606 - a JGit request for this.
Comment 3 creechy 2013-02-13 16:55:13 UTC 
+1 to this. Would dramatically improve the usefulness of Git with NetBeans.