Other

International Business Machines Corporation

Jonathan Goldszmidt

Michael E Cornell

Kelvin Roderick Lawrence

Benjamin R Barber

Sahib Singh

Jeffrey Rovenpor

Richard Bordoni

Taylor N Clark

David B Ponterio

Julia Brady

Ahron Rosenfeld

Alexander J Canter

Max Brivic

James Doerhoff

Embodiments of the present invention provide a system, method, and program product to reduce merge conflicts in an integrated development environment. The present invention includes a computer that receives computer code that includes a plurality of line edits authored by a plurality of developers and development activity information associated with the computer code describing the nature of the plurality of line edits. The computer displays in real-time the computer code in a manner that includes distinguishing the plurality of line edits based the development activity information. Furthermore, the computer dictates an editing activity of the computer code based on the development activity information. Furthermore, the present invention executes within an integrated development environment.

Reducing merge conflicts in a development environment

A curb climbing wheelchair system having left and right side attachments are designed to be attached to left and right side portions, respectively, of a standard wheelchair to enable a wheelchair occupant to climb a curb, bump or other obstruction without the aid of another individual. Each attachment includes a ramp extending from a telescoping arm that is designed to be attached, via a clamping system, to one side of the wheelchair. When not in use, the ramps are folded and stowed away on the sides of the wheelchair. During use, the ends of the ramps are placed on the curb to allow the wheelchair occupant to roll up the curb. To retrieve the ramps (now disposed behind the wheelchair), the wheelchair occupant moves the telescoping arms, if necessary with the aid of an attached circular handle, to lift the ramps thus allowing the wheelchair occupant to grab the ramps. The retrieved ramps then are stowed away until needed.

Curb climbing wheelchair attachment

Growing community of inventors

Dobbs Ferry, NY, United States of America

Jonathan Goldszmidt