Automated modification integration and conflict resolution for software development

US9128805B2 · US · B2

Patent metadata
FieldValue
Publication numberUS-9128805-B2
Application numberUS-201113100467-A
CountryUS
Kind codeB2
Filing dateMay 4, 2011
Priority dateMay 4, 2011
Publication dateSep 8, 2015
Grant dateSep 8, 2015

How to read this patent

A practical reading order for non-experts. Skip the full description unless you need deep technical detail.

  1. Title

    What the patent document calls the invention.

  2. Abstract

    A short plain-language summary of the technical disclosure.

  3. Assignees and inventors

    Who owns or filed the patent and who is credited as inventor.

  4. Key dates

    Filing, priority, publication, and grant dates set the timeline.

  5. First independent claim

    The legal scope of protection — read this for what is actually claimed.

  6. CPC / IPC classifications

    Technology tags used to group this patent with similar filings.

  7. Citations and related patents

    Prior art links and similar publications in this corpus.

Abstract

Official abstract text for this publication.

Proposed changes to a source code generated by client computing devices are integrated with a master version of the code resident on a server computing system remote from the client devices. The client devices connect to the server system over a network and transmit proposed changes to the server system, where resident integration/conflict resolution software automatically integrates the proposed changes into the master version. Any unresolved conflicts remaining after the automatic integration are identified and the server system automatically sends an email notifying the one or more client devices that there are unresolved conflicts. The email includes a link that enables a client device to launch a window on a monitor, and the client device user employs the window to transmit commands directly to and receive further communications directly from the integration/conflict resolution software in an interactive operation to attempt to manually resolve the conflicts.

First claim

Opening claim text (preview).

What is claimed is: 1. A method for integrating proposed changes to source code with a master version of the source code, the method comprising: receiving, by a server computing device, the proposed changes from a client computing device; partially integrating, by the server computing device, the proposed changes into the master version; identifying at least one unresolved conflict between the proposed changes and the master version after the partial integration of the propose…

Assignees

Inventors

Classifications

Patent family

Related publications grouped by family.

External sources

Next steps

Free tools are coming soon. Tell us what you want to track and we'll notify you.

Frequently asked questions

Answers are generated from the same data shown on this page.

What does patent US9128805B2 cover?
Proposed changes to a source code generated by client computing devices are integrated with a master version of the code resident on a server computing system remote from the client devices. The client devices connect to the server system over a network and transmit proposed changes to the server system, where resident integration/conflict resolution software automatically integrates the propos…
Who is the assignee on this patent?
Michaely Nir, Jagne Cherno, Yu Nick, and 2 more
What technology area does this patent fall under?
Primary CPC classification G06F8/71. Mapped technology areas include Physics.
When was this patent published?
Publication date Tue Sep 08 2015 00:00:00 GMT+0000 (Coordinated Universal Time) (B2). Legal status and post-grant events are not shown on this page.
What related patents are in patentsdb?
We list 8 related publications on this page (citations in our corpus or others sharing the same primary CPC).