Ok, so I tried to explain it in the edited screenshot below.
First of all: in the compare editor I've drawn circles around the 'insert' line and the 'bordered' block where I was referring to earlier.
Those are connected by a line. Left is local, right is remote, so in this case you've deleted something locally or someone else has committed something earlier to the remote file.
The other circles:
A: with these buttons you can copy changes from remote file to the local file.
B: with these buttons you can step through the changes.
C/D: the red filled rectangular indicates there's a conflict in this file, the other rectangulars in the margin indicate where about the differences between the files are.
E: with these buttons you switch between: conflict mode, outgoing mode, incoming mode.
First of all you should switch to
conflict mode (buttons E) and solve the conflicts:
a) open a conflict in the compare editor
b) manually step through all changes with buttons B
c) you have to investigated for every change, which file is the truth: local or remote. Local? just leave it and step on to the next, Remote? copy the change to your local file with buttons A and move on to the next change.
d) if you stepped through all the changes: rightclick in the local area of the editor and press: 'mark as merged'. This is a flag which is an indicator for eclipse that your local file has all the code you want to keep.
Now this change will move to outgoing mode.
Repeat these steps for all conflicts.
Second: move to outgoing mode with buttons E:
a) just
commit all the changes that are shown in the left navigation panel (below buttons E)
Third: move to incoming mode with buttons E:
a) just
update all the changes that are shown in the left navigation panel (below buttons E)
Hope this will help you move on...
- Screen shot 2009-10-01 at 17.35.20.JPG (347.52 KiB) Viewed 4389 times