CODEWITHSUNDEEP
gitbitbucket
zakjma
zakjma

Reputation: 2110

Delete/reset master branch

I want to clear master branch. I run below code:

// on master branch
git checkout -b develop
git push
rm -rf .git
git init
git add .
git commit -m "Initial commit"
git remote add origin <your-assembla-git-url>
git push -u --force origin master

I want to create a pr from develop to master. It says that they are unrelated. That is right, I had a mistake!

How can I fix this? enter image description here

Upvotes: 1

Views: 279

Answers (1)

Thorben
Thorben

Reputation: 86

When you want to clear the masters branch, why you dont create a new empty repository, then push it to your remote:

  1. git init
  2. git commit -m "Initial commit"
  3. git add remote <your_ssh_url>
  4. git push --force on your masters branch

After this (in the same directory) you merge your develop just directly into your masters and push it to your bitbucket:

  1. git checkout master
  2. git merge develop

Basically bitbucket is correct. Your develop is now not created from the master branch anymore, so that they are unrelated and do not share the same history. What you can to do is: Revert the master to the commit where your develop was created and do the push --force of your masters branch. Then the develop is not unrelated anymore.

But maybe you are just saying that doesn't matter to me, so you can just accept that they are unrelated. Looks not that nice, but does not really matter. E.g. when our team migrated from SVN to Git we had the same behaviour and the unrelatable master branch was not avoidable and it never damaged anything / anyone here...

Upvotes: 2

Related Questions