Hello,
Thanks for your reply. I appreciate your insights and advice.
@Jaycee_Lewis , thank you for reaching out to the community for assistance, and thank you, @Mike_Eastwood, for sharing your experiences.
I agree that it’s best to avoid conflicts in advance by working on different parts of the code. However, in this case, I was already working on a feature branch when the other developer started working on their own feature branch. We didn’t realize that we were working on the same code until we were ready to merge our changes.
I’m still learning about the best practices for resolving conflicts between different feature branches. I’ve learnt from a group that it’s helpful to use a merge tool like Git Merge Tool or Beyond Compare. These tools can help you visualize the conflicts and resolve them more easily.
I’m also looking for tools or resources that could simplify the merging process. I’ve heard about some CICD tools that can help automate the merging process. I’m going to do some research on these tools and see if they would be a good fit for our team.
Thanks again for your help. I’ll keep you updated on my progress.