Page History
...
If the local commits and the commits from upstream will modify the same line in the same file, this will result in a merge conflict.
| Info |
|---|
NOTE: We are still not confident in the usage of "rebase" below. There was one instance where we ended up losing files. Maybe safer to use "pull". |
This conflict can be resolved in two different ways:
...
Overview
Content Tools