T
T
tef2016-03-13 16:01:02
git
tef, 2016-03-13 16:01:02

What is the general algorithm of a version control system?

The question is not really about git and svn. I want to make a service based on custom editing of the same text. But I can not delve into the algorithm of work. The problem is that if the participants work on the same site, then the last change that was made wins out?
For example, I can suggest taking Wikipedia or notabenoyd.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
D
Dmitry Voronkov, 2016-03-13
@tef

The change that the user chose when merging wins. For example:
There is a string: ABCD
1 change: ACBD
2 change: ACBE
3 change: DCBA
The string consists of characters:
A -> D
B -> C
C -> B
D -> E -> A
The first three characters have the same final change , so they will certainly be accepted
And the latter needs the user who performs the merge to select E or A
That is, either the end result:
DCBE
DCBA

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question