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!
19 Replies
not gonna lie, but, it sounds like y'all are overcomplicating everything, and stuff's breaking left and right
why is the landing page so complicated to need multiple sections?
why is it in pure html, instead of another language like php or javascript or hugo?
It's because we're all working on the same page, and each person is assigned some sections to code.
that's hell to manage
We're still learning 😅
do you know if the host is using apache? or has php?
None of that has been integrated. We've just been working with HTML and CSS for now
then i recommend you to stop
or, you could try to pick one that pushes the changes to the branch, then all the others stash the changes then pull and then unstash and then push
it's leagues better if you are all working on separated files, instead of all on the same file
or, you can just push and manually deal with merge conflicts by not overwritting others' changes
So what you're saying is, each collaborator has to pull changes from the test branch into their own branch in order to solve this
if that's how you're all working, yes
Oh okay. That should work 👍
Alright then. Thank you for your time 🙏
but honestly, what i would do is to just find a way to have everything in separated files
it will save you a ton of headaches
No problem man. I'll see what I can do about that
if you all have python, there's a way to test the final result and terribly build a final version that you can use
or even in the browser, you can make this work with javascript
Looks like I have a lot more to learn. If you don't mind I'd love some tutorial recommendations on how to do what you suggested
well, in javascript, you can just use a
fetch and then shove the content into a div
it's awful, and don't do that, but it is "ok" until you have a proper system
same for css: you can use the @import until you have a proper system and a proper build step (if you use sass, which you probably will want to)Yeah, Sass will come in handy. I'll work with these for now, thanks again.
you're welcome
sometimes, the answer to your question is something you didn't ask for, but (trust me on this) it will save you tons of headaches
True. I'm glad I asked at least cause I was getting frustrated
im sure there's a simpler way to do this with git, but honestly, it's too much work
did you managed to solve this?