GitHub Collaboration
Hello everyone,
I am currently working on a landing page project with my team, and we are facing some challenges while merging our individual sections into a test branch. To avoid any confusion, I have created a separate test branch from the main branch for comprehensive testing before integrating the changes to the main branch.
To streamline this process, I have added comments in the HTML file to indicate specific sections for each collaborator. However, we have encountered some issues during the merge process. For instance, when we tried to merge the second branch into the test branch, it overwrote the first feature instead of combining them.
I am seeking guidance on the best practices and steps to ensure a seamless merge of each branch into the test branch, while preserving the integrity of each section in our landing page.
Any assistance or insights on how to resolve this issue would be greatly appreciated!
I am currently working on a landing page project with my team, and we are facing some challenges while merging our individual sections into a test branch. To avoid any confusion, I have created a separate test branch from the main branch for comprehensive testing before integrating the changes to the main branch.
To streamline this process, I have added comments in the HTML file to indicate specific sections for each collaborator. However, we have encountered some issues during the merge process. For instance, when we tried to merge the second branch into the test branch, it overwrote the first feature instead of combining them.
I am seeking guidance on the best practices and steps to ensure a seamless merge of each branch into the test branch, while preserving the integrity of each section in our landing page.
Any assistance or insights on how to resolve this issue would be greatly appreciated!
A friendly place for developers to meet other devs, ask questions, get help, and just have a good time 🙂.
36,263Members
Resources
Similar Threads
Was this page helpful?
