Closed nicoelee123 closed 1 year ago
@carlosparadis Hello, I'm just checking what are the last things that need to be done. Is resolving the conflicts all that's left? I also wanted to ask what's the best way to go about this, like is managing conflicts on the website best practice? Thank you
I'm currently resolving merge conflicts with the master on local machine before I push another commit
The commits from master are conflicting with the changes I pulled from Leilani's and Malia's branches of the functions. Since they are in master now, I think I'm going to try and reset back to before pulled their branches then just pull master and add my changes on top of that
Test cases download_bugzilla_perceval_traditional_issue_comments()
download_bugzilla_perceval_rest_issue_comments()
parse_bugzilla_perceval_traditional_issue_comments()
parse_bugzilla_perceval_rest_issue_comments()