search

SaintAngeLs / distributed_minispace

Microservices based Social Network -- Distributed .Net Blazor solution. MiniSpace is a microservices-based social network designed to enhance student life. Built with .NET Blazor, it enables event management, social interactions, and administrative oversight, providing a comprehensive platform for students and event organizers.
https://minispace.itsharppro.com
Apache License 2.0
5 stars 0 forks source link

Conflicts when merging frontend_fixes into dev #228

Closed an2508374 closed 1 month ago

an2508374 commented 1 month ago

I've created new branch frontend_merge from dev and merged there your branch frontend_fixes. There were a few merge conflicts so I've resolved them. Therefore, after you finish your work, you can merge frontend_fixes into frontend_merge and then create a pull request without any conflicts. Btw, nice work with event cards, it's a magnificent enhancement!

eggwhat commented 1 month ago

Sure thank you, but I still haven't finished yet so hopefully it doesn't result in more conflicts.

eggwhat commented 1 month ago

This issue was resolved in #230