Skip to content

Feature 48#64

Merged
XanderRubio merged 7 commits intomainfrom
feature-48
Sep 6, 2023
Merged

Feature 48#64
XanderRubio merged 7 commits intomainfrom
feature-48

Conversation

@XanderRubio
Copy link
Copy Markdown
Member

@negar-75 added code from pull request #52 to enhance the UI

@XanderRubio XanderRubio linked an issue Sep 6, 2023 that may be closed by this pull request
@vercel
Copy link
Copy Markdown

vercel Bot commented Sep 6, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
before-i-die-achievements ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 6, 2023 9:51pm

Copy link
Copy Markdown
Member Author

@XanderRubio XanderRubio left a comment

Choose a reason for hiding this comment

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

File changes and additions of code is thanks to the contributor @negar-75 for enhancing the UI!

@XanderRubio XanderRubio merged commit cebac7a into main Sep 6, 2023
@XanderRubio
Copy link
Copy Markdown
Member Author

This pull request successfully closes issue #48, and thank you to contributor @negar-75 for her pull request #52 and adding UI enhancement.

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 6, 2023

so now everything has been solved?

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 6, 2023

this is my first time working with Git and Git flow and that was hard experience 😂😂😂😂😂

@XanderRubio
Copy link
Copy Markdown
Member Author

so now everything has been solved?

Yes, it has! Please look at the live link for the website for proof.

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 6, 2023

although I have no idea about what just happened , but that was practical experience 😂😂😂

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 6, 2023

I see!! amazing😍😍😍😍

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 6, 2023

I am so ready to make another change !!!😍😍😍😍
and learn more and more about Git flow

@XanderRubio
Copy link
Copy Markdown
Member Author

XanderRubio commented Sep 6, 2023

I see!! amazing😍😍😍😍

Congratulations on gaining more experience with Git today than you might have thought possible when starting out. I will do my best to provide a brief description of what happened. The main issue we encountered was that your forked version and add features branch of issue-#48 hadn't been fetched to be udaped with the main working branch of the Before I Die Code repo. This was a valuable lesson for me, and we will need to have proper documentation in place to make it easier for other developers to understand and receive support on how to prevent merge conflicts from happening. If conflicts do occur, the only option is to merge the main branch into the feature branch, potentially losing the work that you want to add to the main branch and needing to revert the commit. I need to understand why this is occurring. Please let me know if you have any further questions. I will be signing off for tonight, but I would like to hear your thoughts on how we can continue to improve the UI to look more professional and sleek. Have a good night and thank you for your time and patience! I will be adding a LinkedIn recommendation later as well. Clapping HandsClapping HandsClapping HandsClapping Hands

@negar-75
Copy link
Copy Markdown
Contributor

negar-75 commented Sep 8, 2023

thanks @XanderRubio for your informative text and I appreciate it,
Now I am going to create another merge request for auto translation

@XanderRubio
Copy link
Copy Markdown
Member Author

thanks @XanderRubio for your informative text and I appreciate it, Now I am going to create another merge request for auto translation

Great @negar-75 and my pleasure!

@XanderRubio XanderRubio deleted the feature-48 branch September 8, 2023 23:17
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.

🟢 🎨 UI Design for the text box that displays contributors text

2 participants