Duplicate masters branches locally
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.
- Rename file for all commits in a Git repository
- git pull and resolve conflicts
- How to substitute text from files in git history?
- Define git alias with the same name to shadow original command
- Specify extras_require with pip install -e
- How do I rebase my PR without adding commits to it?
- Merge git repo into branch of another repo
- How to correct `git` reporting `detected dubious ownership in repository` without adding `safe.directory` when using WSL?
- Trouble setting up git with my GitHub Account error: could not lock config file
- In a Git repository, how to properly rename a directory?
- Git submodule push
- send-pack: unexpected disconnect while reading sideband packet when pushing to local git server
- Gerrit: configure similarity index threshold (renamed file)
- Git double revert : How to keep original author?
- Gitignore not working
- git submodule deinit not working as expected after submodule url change
- How can I find/identify large commits in Git history?
- How to fix : failed to push some refs to gitlab?
- Gitlab: webhook event on create branch
- Using "x AND y" instead of "x OR y" when using --grep twice in git-log
- Issues with commit message when pre-commit hook changes files
- Unstaged changes left after git reset --hard
- How to clone only a folder from a git submodule?
- How do I checkout a branch ignoring all local changes?
- Include only tracked files with npm publish
- Prevent Pull Request builds from triggering Continuous deployment trigger Azure DevOps Server
- Heroku/Git: protocol error: bad line length character: erro
- Add all files to a commit except a single file?
- Git Bash is extremely slow on Windows 7 x64
- How to delete a git working tree branch when its working directory has been removed?