- Note: Make sure that you commit your files locally first. Otherwise, you will go in circles.
- From Eclipse, right-click on your project.
- Select Team -> Synchronize workspace.
- You will then see conflicting files marked with a special icon.
- Open the conflicting file and make all your changes.
- Right-click on the file and select Mark as Merged.
- Right-click on the your project and select Merge.
- Right-click on the your project and select Team->Push to Upstream.
About the author
Xuan Ngo is the founder of OpenWritings.net. He currently lives in Montreal, Canada. He loves to write about programming and open source subjects.