1

I want to map my working folder with existing bitbucket repository

What happened

I had a working folder connected with Bitbucket Repository. And I was working on a branch. The branch was already pushed and exist on Bitcucket remote. I have committed some changes locally, and then while committing one more changes SourceTree hanged and did not respond for half an hour. I will not blame source tree, it was my machine. So had to restart my machine. after that i cannot push any changes and was getting file corrupted error. Then, I deleted the .git folder :(

Problem

I was searching for any way to map the local folder with existing git repo, could not find anything. Is it possible or not?

Plan B

I can map my existing repository to a new folder and then copy the changed folders to the mapped folder. Not sure, that will work or not? It may work, but i am looking for any other solution better than this or a proper way to do that

Community
  • 1
  • 1
MJK
  • 3,434
  • 3
  • 32
  • 55
  • https://stackoverflow.com/questions/3311774/how-to-convert-existing-non-empty-directory-into-a-git-working-directory-and-pus – Avinash Aug 22 '20 at 14:52

1 Answers1

4

First I just want to point out that by deleting the .git you did loose all your work on any other branches you had locally. That being said, as long as your current folder structure is the one that you want, then it should be okay.

Here is what you want to do:

1) Initialize a new .git repository using the command git init. it should tell you that you're on the master branch.

2) Go ahead and run git checkout -b [name] where [name] is the name of the branch you were previously on. Once you have your branch name correct you can run git branch -D master

3) Attach your git repository to your remote using git remote add origin [url] where [url] is the URL of your remote git repository.

4) run git fetch to get the remote history

5) track your current branch upstream using git push --set-upstream origin [branch] where [branch] is the same as [name] from step 2

After following these steps, if you get errors it may be due to divergent paths. If that is the case just let us know because I'm afraid that is an entirely separate problem.

Oxymoron
  • 1,380
  • 2
  • 19
  • 47
  • Thanks @Oxymoron Cool, this works like a charm. Glad to know that, you can do this from git cmd. Are there any ways to do this from Source tree? – MJK Jul 25 '17 at 08:44
  • sorry @MJK I primarily use the command line. I wont be of much help for GUI related questions. – Oxymoron Jul 25 '17 at 18:36
  • @Oxymoron when runnig "git branch -D master". will it delete main branch ? – legacy Jun 21 '21 at 14:06
  • @legacy Locally, yes. The remote master branch will remain intact. So when you `git pull` in the future, then it will pull down with all the rest. – Oxymoron Jun 23 '21 at 03:06