Skip to content

Conversation

ruba0s
Copy link

@ruba0s ruba0s commented Sep 30, 2025

No description provided.

@mikehquan19
Copy link
Contributor

@ruba0s, as for merge conflicts, ideally, you should pull the new changes to your local first, manually resolve those conflicts, and push them back. Resolving shouldn't take very long if those conflicts are not really related to what you are working on.

@ruba0s
Copy link
Author

ruba0s commented Oct 3, 2025

@mikehquan19 Sounds good! Once I'm done with that and want to commit merge, should I choose commit updates to the develop branch or create a new branch and commit updates?

@mikehquan19
Copy link
Contributor

You commit merge to whichever branch you are working on, don’t create a new branch.


// paginate the sections
bson.D{{Key: "$skip", Value: paginateMap["latter_offset"]}},
bson.D{{Key: "$limit", Value: paginateMap["limit"]}},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe these 3 last stages here are essentially the same (since they all sort and paginate the latter object whether it's course or section), so you could potentially put them after (or before?) conditions.

Other than that, this one should be ready for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants