What to do if

Git conflict

The git conflicts are part of the development process. There are no general instruction of how to resolve them since it depends on the context. It is better to avoid them if possible by checking that you are not changing a code what another person is working on. The rule of thumb is that it is better to avoid making changes into many files in one branch.

If the conflict did happen you should try to resolve it before merging or making pull request from the branch with conflict to dev branch. After the conflict is resolved you should also check that the changes did not brake anything and the API still works fine. In case you did try to resolve the conflict, but still could not figure out how, you can write a message a person who have made the last changes to the file where the conflict is or me (MikhailDeriabin).

Pending code review

Code review takes some time to be made. Usually it should be resolved within a day. So, for example if you have made a pull request in the morning the review usually will be done at the same day. If the pull request is done in the evening the review will be ready tomorrow afternoon.

In case the review is pending too much you can write me a message about it.

If you need changes made in one of the last pull requests to start resolving a new issue, you can make a new branch from the branch there the required code is present.