You have to merge most important branch into yours (important) and after that reset soft to primary, after that all of your adjustments might be unstaged and you'll dedicate them2nd dilemma, when establishing the sql server did you incorporate by yourself in since the admin or maybe "sa", if "sa" only then login as "sa" and incorporate your self in