Follow Techotopia on Twitter

On-line Guides
All Guides
eBook Store
iOS / Android
Linux for Beginners
Office Productivity
Linux Installation
Linux Security
Linux Utilities
Linux Virtualization
Linux Kernel
System/Network Admin
Programming
Scripting Languages
Development Tools
Web Development
GUI Toolkits/Desktop
Databases
Mail Systems
openSolaris
Eclipse Documentation
Techotopia.com
Virtuatopia.com

How To Guides
Virtualization
General System Admin
Linux Security
Linux Filesystems
Web Servers
Graphics & Desktop
PC Hardware
Windows
Problem Solutions
Privacy Policy

  




 

 

Eclipse Workbench User Guide
Previous Page Home Next Page

Working with another user

Instructions were given explaining how to create a project and commit it to the repository. First a repository location was specified. Next the project was shared with that location and the HEAD branch and the resources were added then committed.

The repository currently contains the project and the two files that were committed (file1.txt and file2.txt).

It's time to find that co-worker (let's call him Fred) to work through some steps with you (for the remainder your name is Jane). This section will demonstrate how two people can work on the same project and simultaneously commit changes to the repository. Specifically, the following actions will be taken:

  • Fred will import the project to his Workbench
  • Fred will make changes to file1.txt and file2.txt.
  • You will update these new changes and also add a new file called file3.txt.
  • Fred will make more changes to some files while you change the same files. Fred will release his changes first.
  • You will have to resolve the conflicts between files that you both changed.
Here is some terminology commonly used to describe changes:
incoming Changes that are in the repository, which you have not yet updated to.
outgoing Changes that you are committing.
conflict Both you and the repository have modifications to the same resource.

 
 
  Published under the terms of the Eclipse Public License Version 1.0 ("EPL") Design by Interspire