Details
-
Task
-
Resolution: Done
-
P3: Somewhat important
-
None
-
None
-
None
Description
We should document all different git pull situations so that our code is able to handle them.
- Normal Git Pull - local is behind remote - no conflicts
- Git pull - local is behind remote and has commits - no conflicts
-
- How to assert that the commit and pull is fast-forward?
- Git pull - local is behind remote and has commits - with conflicts
- This is a non-fast-forward commit with merge conflicts
This task is only for documentation that helps us in improving our own implementations to handle such situations.