Closed simrin051 closed 3 years ago
This pull request has conflicts, which you need to resolve! :partying_face: Don't need to worry at all, please follow the steps here - https://github.com/twindle-co/twindle/wiki/Resolving-merge-conflicts
I've already fixed the problem in TEAM.md in #935 , so this should be closed.
Simrin, it seems you have been making all the PRs from the same branch. Whenever you work on a feature, make a new branch, do your code, make a PR, and when it gets accepted, delete that branch. These are the direct commands, in case you're not familiar
git checkout main
git push origin --delete BRANCH_NAME
git branch -D BRANCH_NAME
Alignment in Team.md