Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
How can I merge these? I don’t know how this has happened, I’v only worked with one branch before and today I was going to create a new one (the top blurred out one).
Please Note: I’m a front-end developer and basicly only know (about git) what I need to use this software (gitbox)
Edit: I cannot merge them in gitbox it seems, I can’t select just one of them both are always selected, I’ve tried restarting gitbox as well.
I actually had two master branches, one called “master” and one called “master (computer_name)” because I stupidly tried to use Sugarsync (like dropbox) on my Sites folder, also I added the folder incorrectly so it duplicated almost every single file and added my computer name within parentheses.
(I had a bad cold when I did this)
I closed gitbox and deleted all duplicate FILES, worked like a charm.