How do I merge changes to metadata on salesforce.com servers with local changes in my project?
Use the Synchronize Perspective by right-clicking on your Force.com project and select Force.com > Synchronize with Server. You may use the arrows at the top right to select changes to accept locally. You may also perform global acceptance by right-clicking on an artifact and selecting to override the remote artifact or replace local with remote.