During my time working on the Easy Life Store project, I used Git extensively to manage our codebase. We had a team of developers collaborating on different features, which made version control crucial. I regularly committed my changes and pulled updates from the main branch to stay in sync with the team. There was an instance where I encountered a merge conflict while integrating my feature branch with the main branch. To resolve it, I carefully reviewed the conflicting files to understand the changes made by both myself and my colleagues. I then communicated with the team to ensure I understood the intent behind their changes. After resolving the conflicts by manually editing the code, I tested the application to confirm everything was functioning as expected. This experience taught me the importance of clear communication and attention to detail when working with version control systems like Git.