Moje odkazy

• Nabídka služeb
• Relational pipes
• SQL-Výuka.cz
• SQL-DK
• Nekuřák.cz
• i1984.cz
• Telekomunikační slovník

Ostatní odkazy

• GNU.org
• FSF.org
• Monča.cz

Moje ilustrace k problému tzv. criss-cross merge.

The criss-cross merge case:

Here's an example of where simple three-way merge can't do the right thing. Each letter represents a snapshot of the history, and time goes downwards. The numbers after some letters refer to which line number was modified at that time.

Vektorová ilustrace:

Původní ASCII art:

A
|\
| \
|  \
|   \
|    \
|     \
|      \
B8      C3
|\     /|
| \   / |
|  \ /  |
|   X   |
|  / \  |
| /   \ |
|/     \|
D8      E3
 \      |
  \     |
   \    |
    \   |
     \  |
      \ |
       \|
        ?