| Rename merge does not work - is there any workaround? [message #964820] |
Tue, 30 October 2012 20:31  |
 Marton Sigmond
Messages: 73
Registered: July 2009
Location: Hungary |
Member |
|
|
Hi,
Try the following steps, do everything in the IDE:
1) Create a Java project, a Java interface in it, and a method in that interface.
2) Create a Git project around it, and commit an initial revision.
3) Add a new method to the beginning of the interface (before the original method), and commit the change.
4) Create a new branch from the initial revision, and checkout that branch.
5) Rename the interface (or move it to another package), and commit the change.
6) Add a new method to the end of the interface (after the original method), and commit the change.
7) Finally try to merge the new branch with the master.
What you will get is an ugly conflict.
However, if you followed the above steps closely, you can see that it should be a non-conflicting merge.
Also, if I perform the last step in the command line, the merge will happen seamlessly.
This is quite unfortunate as it makes refactoring cumbersome.
Is there any workaround for this problem?
Has anyone filed a bug for this yet?
Cheers,
Marton
|
|
|
|
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.03583 seconds
] 
Search
Help
Register
Login
Home
