Abstract: A list of various versions of file sets that need to be reconciled (collisions) are automatically loaded into a collision handler. The user works through the list, resolving differences by selecting one of the files or by merging several of them through selection and modification, as required. The user is provided with buttons that allow rapid changes between different styles of views (Split, Composite, Split-Merge, Composite-Merge) which allows the user to see the files in a number of different ways to further facilitate the process.

Abstract: A system-integrated input device for manipulating objects on the display of a computer screen. The device is integrated as a pointer stick, which may be located on an existing keyboard, on an existing mouse device, or elsewhere. Both 2-dimensional and 3-dimensional user input are supported. In a first embodiment, the device is easily convertible between 2D and 3D input mode. Preferably, this conversion occurs by pressing down on the pointer stick, which is implemented as a spring-loaded device. The device supports input in the X and Y direction while in 2D mode, and adds the Z direction while in 3D mode. Movement in the Z direction is indicated by rotating the pointer stick to the left or right. In a second embodiment, movement in the Z direction is indicated by pushing and pulling on a sliding, or telescoping, pointer stick.