|
| Re: Resolve conflict without changes [message #1699994 is a reply to message #1699941] |
Mon, 29 June 2015 14:40  |
 Fábio Silva
Messages: 18
Registered: December 2014 |
Junior Member |
|
|
Just to be clear: the same issue occurs in Eclipse. Just follow these steps:
1 - checkout a project;
2 - make a simple change and commit it;
3 - make a remote change that conflicts with the local one;
4- run the pull command to get the remote change;
5 - run the merge tool. It does nothing if you don't change anything, so make a change like cut and paste the same piece of code;
6 - save the file and add it to index;
7 - try to commit the file. Eclipse won't list it, since there is no real change, but it should have a change to represent the "marged" state;
8 - try to push to upstream. Now you have a "MERGING_STATE" issue to deal with.
What's wrong with these steps?
[Updated on: Mon, 29 June 2015 14:41] Report message to a moderator |
|
|
Powered by
FUDForum. Page generated in 0.02804 seconds
] 
Search
Help
Register
Login
Home
