| Unable to Save Resolved Conflicts in EGIT [message #1786284] |
Sun, 29 April 2018 13:48  |
 Dennis Putnam
Messages: 37
Registered: December 2017 |
Member |
|
|
I am trying to merge a branch into my master for a Java project. I don't understand why there are conflicts but in any case I am in the Compare and Index view. I clicked the current change left to right icon. The supposedly modified source file (right side) is then moved from the unstaged to staged area automatically. However, the source icon still has the red X and that file is in both the staged and unstaged areas. When I look at the staged source it still has the same conflicts. What am I doing wrong?
As for the conflicts, they all seem to be the changes I made in the new branch. For example:
In master I have:
public double DOOROPENRATE=1.0;
In the branch I have:
public double DOOROPENRATE=.25;
That's not a conflict, that is a change I want to merge from the branch into the master. TIA.
[Updated on: Sun, 29 April 2018 13:57] Report message to a moderator |
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.01828 seconds
] 
Search
Help
Register
Login
Home
