Resolving merge conflicts

Jump to bottom Edit New page

Nishank Navelkar edited this page Oct 17, 2020 · 9 revisions

Pull the changes from the main repo to your forked repo
Check for changes (VS code also provides a promt to resolve the conflict)
After solving the conflict, save and push the changes
Ask for review by reaching out on discord or twitter.

By Nishank Navelkar

Note:- If you want to add some more information, open a new issue