What is the simplest way to do branching and merging using TortoiseSVN?

Assuming your work directory is working from the trunk: Right-click on the “root work folder” (this term always refers to Windows Explorer) and do svn update to update your work folder to the latest trunk. Make sure what you have is stable. Right-click on the root work folder and do svn commit to make sure … Read more

How to get started with svn:externals?

Here are some sections about it in the svnbook / TortoiseSVN manual: This is the svnbook page on svn:externals. It is the most useful resource on the subject. This one explains four ways to include sub-projects in the workflow (and in the process misses a fifth one: symlinks). And this last one is a TortoiseSVN-specific … Read more

Resolving tree conflict

What you can do to resolve your conflict is svn resolve –accept working -R <path> where <path> is where you have your conflict (can be the root of your repo). Explanations: resolve asks svn to resolve the conflict accept working specifies to keep your working files -R stands for recursive EDIT: To sum up what … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)