Some when open solution.

This forum is only for questions or discussions about working with the mojoPortal source code in Visual Studio, obtaining the source code from the repository, developing custom features, etc. If your question is not along these lines this is not the right forum. Please try to post your question in the appropriate forum.

Please do not post questions about design, CSS, or skinning here. Use the Help With Skins Forum for those questions.

This forum is for discussing mojoPortal development

This forum is only for questions or discussions about working with the mojoPortal source code in Visual Studio, obtaining the source code from the repository, developing custom features, etc. If your question is not along these lines this is not the right forum. Please try to post your question in the appropriate forum.

You can monitor commits to the repository from this page. We also recommend developers to subscribe to email notifications in the developer forum as occasionally important things are announced.

Before posting questions here you might want to review the developer documentation.

Do not post questions about design, CSS, or skinning here. Use the Help With Skins Forum for those questions.
This thread is closed to new posts. You must sign in to post in the forums.
11/6/2007 8:05:38 AM
Asad Samarian
Gravatar
Total Posts 550
View Posts

Some when open solution.

Hi
When I update mojoportal source code on my computer by TortoiseSVN I can’t open mojopotral.Web Project when open the mojoportal-complete.sln .So I have to edit mojoPortal.Web.csproj and clear some line from it. These lines are:
=======
>>>>>>> .r2934
=======
<<<<<<< .mine
<<<<<<< .mine
<<<<<<< .mine
=======
Please tell me that my work is correct?.Are better way?
Thanks
A. Samarian
 

11/6/2007 8:38:05 AM
Joe Audette
Gravatar
Total Posts 18439
View Posts

Re: Some when open solution.

You are getting a merge conflict. Most likely cause is that you have added files to your mojoPortal.Web.csproj so it is different from trunk and when it tries to merge it has conflicts.

Best way to avoid this is to NOT add your custom files to the project. Build custom features in external projects and don't add your custom skins to the project.

If you right click your mojoPortal.Web.csproj file and choose Tortoise svn > Revert it will remove your customizations from the project file.

Hope it helps,

Joe

You must sign in to post in the forums. This thread is closed to new posts.