⚡️ Branch Conflicts: 2-Day Battle Won! ⚡️

GitHub threw a curveball at me this week…
I tried to merge my actors branch → Website folder in the main branch, and boom 💥
Branch Conflicts Appeared! 😅

Here’s what went down:

📝 Conflicting Files: GitHub flagged multiple files that needed attention.

🛠 Action Taken: Resolved conflicts manually & ensured no files were lost.

⏳ Time Spent: 2 intense days of debugging and merging!

I even created a GitHub issue:
"Merge actors branch into Website folder in main"

Preserve all main branch files ✅

Move actors branch files into Website folder ✅

Push clean merge back to GitHub ✅

🎉 Status: Issue Closed & Merge Successful!
GitHub taught me patience, and now the Website folder is fully updated.

#GitHubJourney #BranchConflicts #MergeSuccess #CodingLife #YmSoftware

🚀 Birhane Hiwot Sunday School – Attendance Management Update!

I’m thrilled to share the latest milestones in my project! 💻✨

What’s New:
🔐 Login Page: Secure and smooth entry for users.
📊 Admin Dashboard: Manage students, facilitators, and reports in one place.
🗓 Attendance Dashboard: Date & grade filters, plus new student registration for smarter tracking.
🏫 Education Department Dashboard: Easily manage teacher assignments and student records.
📝 Other Improvements: Smoother workflows and performance upgrades!

Every update makes the system smarter, faster, and more user-friendly.
And

trust me… this is just the beginning! 🚀

🔗 Check it out live:
https://birhane-hiwot-sunday-school-attenda.vercel.app/

#Birhane_Hiwot_Sunday_School #Attendance_Management #Nextjs #WebDev #CodingLife #YmSoftware

🚀 Birhane Hiwot Sunday School – Attendance Management Update

I’m beyond excited to share how far this project has come! What started as a simple Attendance Management tool ✅ has now grown into a full-fledged Education Department (ትምህርት ክፍል) 📚 module — and we’re just getting started!

✨ New Features Added
🎓 Student Records – Keep detailed records with IDs, grades, and gender for better tracking.
📚 Subject Management – Initialize and manage subjects for each grade.
📝 Results Management – Add and track results for assignments, midterms, and finals.

🔮 Future Plans
We’re enhancing Subject Management and Student Records to make the system even more powerful. And yes… the name is evolving too —

from Birhane Hiwot Sunday School – Attendance Management ➡️ Birhane Hiwot Sunday School.

Believe me… this is just the beginning! 🚀

#YmSoftware #Birhane_Hiwot_Sunday_School #Attendance_Management #Nextjs #WebDev #CodingLife #WebApp #SchoolManagement #SundaySchool #EthiopiaTech #MongoDB #SoftwareDevelopment