Method and device for integrating multiple different versions of electronic files

A method of merging a plurality of different versions of an electronic document during a software development process can include identifying the plurality of different versions of the electronic document. The electronic document can have a defined structure. The method further can include determining a plurality of deltas between the different versions and determining relationships, between individual ones of the plurality of deltas according to the defined structure of the electronic document. One or more of the plurality of deltas can be selectively accepted in a merged electronic document according to the determined relationships.