Dummy project for my spikes (tiny PoC) on git or github tooling and procedures.
Let's test
- a ff (smooth) fetch.
- a ff (smooth) rebase.
- ok: I checked that Repository>Pull works at least for ff.
- github-desktop guides the user in handling conflicts:
-
- It detects the clash
-
- It merges and marks the conflict in the local clone (unstaged).
-
- It asks the user to solve the conflict and offers to commit the resolution.
-
- It applies the solution to the conflict.
-
- It visualizes a sequence: 0->A, then 0->B, then B->AB, which feels weird and cofusing.
-
- git log --graph --oneline showsdiff the merge as a branch.
-
- git diff visualizes as requested (no preffered sequence).
-
- Detects github-desktop conflicts upfront?