Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
i’m trying to merge two projects, but no success.
once i started some project, and my partner took a copy of it.
since then i’ve worked with ui (continued with the project i started) and my partner worked with db (he has added some classes and edited couple of already created classes).
now we are trying to merge these two projects, but we cant. we always getting some error messages…
any help how to do that will be grate (all the merging tutorial i’ve found didnt help much)
Not sure what the error is. But if all else fails, you can manually merge your two projects using kdiff3 or WinMerge, then check in this merged project.