You'll want to merge primary branch into yours (essential) and then reset comfortable to primary, after that all of your changes might be unstaged and you can commit them2nd question, when establishing the sql server did you incorporate you in as the admin or merely "sa", if "sa" only then login as "sa" and incorporate on your own in as a domain pe