Hi @Tsquare17,
could you please resolve the merge conflict? (Not anybody's fault. It just happens sometimes when different PRs make changes to neighbouring or identical code lines.)
You can either rebase develop and force push your branch or merge develop and push your branch.
Hi @Tsquare17, could you please resolve the merge conflict? (Not anybody's fault. It just happens sometimes when different PRs make changes to neighbouring or identical code lines.) You can either rebase develop and force push your branch or merge develop and push your branch.