fast-forward merge - Githubissues

plt-tud / r43ples

Revision Management for the Semantic Web

Other

19 stars 16 forks source link

fast-forward merge #35

Closed Flugtiger closed 7 years ago

Flugtiger commented 9 years ago

Fast forward merging is currently not supported. This means every merge generates a new revision even if one branch is a direct predecessor of the other branch. Together with issue #34 this creates some weird revision-graphs.

Graph before merging: revisiongraph_before_merge

Graph after merging: revisiongraph_after_merge

stephanhensel commented 7 years ago

Fast forward is now supported. Please have a look at b13cd3a0af7661525e0640e553e809e7680f77f0, there you will also find the corresponding revision graph structure. There is a special Fast Forward merge query (see documentation).