We had two separate branches, each corresponding to a different task, but both making changes to the same section - the main page of the website. We merged the first branch into the main branch, incorporating its changes into the main content file. We then continued working on the second branch. When we attempt to merge this second branch, we encounter conflicts between the main file and the second branch. If we accept the changes from the main file, it overwrites everything we worked on in the second branch. However, we want to update everything except the parts we worked on in the second branch.
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.