Edit Question - KnowledgeHub

Title Body

So Im a source control idiot so please humor me with this checklist. I finally decided to use Mercurial + TortoiseHg + (VS2010 + HgSccPackage ) + Kiln for my next project. I read http://hginit.com/ and I played around quite a bit, but I don't know much about source control so I don't want to make a mistake here, my current project is my biggest and most valuable one yet. So here is my checklist: Creation : I create a new repo in kiln online. Then clone it on my pc. I copy my entire project folder (Solution with mutiple projects under that folder) into the repo. I add this content into a .hgignore file in the repo root. From TortoiseHg I click add files I occasionally commit from VS. When I'm good and ready I go Sync->Push (So this is all good right?) One problem I had here is. I can't find Add Files equivalent in HgScc, I noticed when I added a new files from the VS-IDE, it doesn't have the icon for source control. (Its not added to mercurial?) So I ended up adding files through the IDE and they didn't have a check. Then after a few commits (and other things I don't remember) I noticed there was an extra branch or something: And now If I go try to push I get "(did you forget to merge? use push -f to force)" . (And yes I hit incoming and I have NO in coming changes) Anyway, was just a playground, ** I just realized using TortoiseHG ->Add Files everytime I created files from VS fixes things? **(Or is there

Tags (comma-separated) Cancel