Closed khaiyra closed 2 years ago
@tetron this is set to go.
There's a merge conflict
I guess because my branch wasn't up-to-date when I pulled a request. Let me try that again.
@khaiyra it would be better to start using the same pull request. This way the reviews are kept in a single place, and it's easier for reviewers as they won't mistaken the other PR for a duplicate task (which happens when we have a large group of devs working on the same project :slightly_smiling_face: ). It also gives you an opportunity to learn or practice Git, learning how to rebase and fix conflicts. /cc @swzCuroverse
ooh my bad, now I've learnt this and would put into practice moving forward. Thanks @kinow for pointing that out and sorry for any inconveniences🙂
matched the sequence of the types of processes listed.