olexandr-konovalov
commented
4 years ago You can see now the message "This branch has conflicts that must be resolved" because the line you changed has been already changed differently in the branch. There is a way to resolve this:
- change to gh-pages branch
- pull changes from ccp-codima repository
- change to your PR branch
- rebase it and fix conflicts
- force-push your branch to your fork.
This will update the PR. We can practice at the next coffee break, if no time, please ask me later via comments under this PR!
this is example