search

CSAllenISD / 2023-ISP-Bug-Tracker

Other
3 stars 0 forks source link

Merge dev to main after functionality development #15

Open Brook-A-CS opened 1 year ago

Rafid-A commented 1 year ago

Can you add more descriptions to this merge issue? Why was it necessary to merge the branches?

Rafid-A commented 1 year ago

Ignore my last comment, but yes, we should do this on a somewhat regular basis just so it doesn't become a problem later on.

Brook-A-CS commented 1 year ago

https://github.com/CSAllenISD/2023-ISP-Bug-Tracker/commit/78d690c191d06d25202c5d1470c74a4812996b89

Merged homepage to main, not functional yet

Brook-A-CS commented 1 year ago

I've decided to wait before pushing my development to main until I get the server working. Right now the functionality will basically need to be re made with the server in mind so there is no point in updating functionality to work with main branch as it'll have to be replaced later.

Rafid-A commented 1 year ago

With commit 969f7c8 and 38fe326 most of the frontend has been merged to the main branch