- Note: Make sure that you commit your files locally first. Otherwise, you will go in circles.
- Right-click on your project.
- Select Team->Synchronize Workspace.
- Go through the compare view of each file marked as conflicting and then update your local file accordingly. Save it.
- Then, right-click on the file, click on Marked as Merged.
- Back to project view, right-click on your project and select Team->Merge....
- Right-click on 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.