White Lion Docs

Review Process

Code review is an important process to ensure that code is maintainable and aligns with the team.

After receiving approval to go to code review, commit your feature branch and push your branch to origin my-feature-branch.

git push origin my-feature-branch

Then go to github and create a pull request.

TIP

If you have merge conflicts try to resolve them before creating the request. Resolve Conflicts

After all conflicts have been resolved, you should look at the files that have changed in your feature branch. Read through, your code carefully, you will more than not find you might have made a change you in a file you unaware of.

Through the course of several commits file changed may have occured without intention. Here is a guide to restore those files to their previous state while maintaining your new code.