Commit Graph

Select branches

Hide Pull Requests

main

merge-conf-1

merge1

merge2

mergeconf-1

mergeconf2

test1

test2

Mono Color

• ab724524f6 Merge branch 'test2' main Stefan 2024-10-28 14:40:47 +0100
• f6df9d33f7 test2 test2 Stefan 2024-10-28 14:38:04 +0100
• 7fefb18a07 test1 test1 Stefan 2024-10-28 14:36:21 +0100
• 64bc2799e4 changed something Stefan 2024-10-28 14:33:58 +0100
• 45e86b3ecd solved merge conflict Stefan 2024-10-28 14:10:41 +0100
• edd9d1fe02 merge2 merge2 Stefan 2024-10-28 14:08:00 +0100
• b3688e89fd merge 1 merge1 Stefan 2024-10-28 14:04:14 +0100
• 9b9105043f adds a commit Stefan 2024-10-28 14:01:49 +0100
• e6f7a485d8 solved merge conf Stefan 2024-10-28 13:41:20 +0100
• 3e9427de9f mergeconf 2 mergeconf2 Stefan 2024-10-28 13:36:55 +0100
• 12f368ca1f merge conf 1 mergeconf-1 Stefan 2024-10-28 13:35:33 +0100
• b4d8831f47 adds some attribute Stefan 2024-10-28 13:32:02 +0100
• 7c06711460 resolves merge conf Stefan 2024-10-28 12:33:16 +0100
• 832178fd37 changes conflict to 2 Stefan 2024-10-28 12:31:29 +0100
• 885ee17cad changes conflict to 1 merge-conf-1 Stefan 2024-10-28 12:30:31 +0100
• b521d30752 adds conflict variable and initialised to 0 Stefan 2024-10-28 12:29:34 +0100
• a31ef80ad7 adds picture for git explanation Stefan 2024-10-28 12:19:38 +0100
• eb4d0b5b76 initial commit Stefan 2022-11-14 15:30:09 +0100