Feedback for page "cli-guides/cli-tutorial/conflict-resolution" #167
Description
Hey, I noticed that this page has some problems compared to the rest of the CLI docs:
Bug 1:
Discrepancies between the text and the examples.
Ok, the pull tells us that we have conflicts and it also gives us a cheat sheet for what to do to resolve them, which is essentially "run but resolve".
However, the $ but pull snippet above it appears to show a clean pull.
Notice how we have two commits that are conflicted, but one that is not. You could have any number of commits marked as conflicted in a branch, and you'll need to resolve each of them one by one.
However, the $ but status above it does not indicate any conflicts.
Bug 2:
The organization of the branches in the examples seems to change between the top and following examples, making it hard to follow.
Bug 3:
The but resolve examples in the remainder of the page do not follow the same format as other console examples.