Contraversum / ContraBot

Discord Bot for Contraversum
1 stars 0 forks source link

Request new match #74

Closed q-Sci closed 1 year ago

q-Sci commented 1 year ago

Fix #42

greg6775 commented 1 year ago

this pr is kinda critical as it probably breaks all other open and future prs due to massive merge conflicts

johan-t commented 1 year ago

this pr is kinda critical as it probably breaks all other open and future prs due to massive merge conflicts

I agree, I think we should first merge #71 and then merge this one

johan-t commented 1 year ago

Can we also merge this directly into main?

q-Sci commented 1 year ago

Can we also merge this directly into main?

Yes we can. But what happened to the concept of the pre-production branch?

johan-t commented 1 year ago

Can we also merge this directly into main?

Yes we can. But what happened to the concept of the pre-production branch?

As long as this branch is a branch of the development branch it is fine, we just need to remember to merge main into development before starting something new

johan-t commented 1 year ago

Also could you think of a way where we could put a button that starts the /match command to make it easier for users to find this feature?

greg6775 commented 1 year ago

please don't use feature branches to completely re-structure the entire codebase in the future