Hi Mauro,
Just a heads up, I moved your reply to a new question as it concerned a different topic from the one discussed in your previous question.
If myrepo is a fork of myrepo1 then it's pretty straightforward to merge with a pull request from Bitbucket's website. If you open myrepo on Bitbucket's website, go to the Pull requests page, and select Create pull request, you will have the option to change the Destination Repository into myrepo1 and then select both a source branch and a destination branch for the PR.
If myrepo is not a fork of myrepo1, then there is no way to do the merge from Bitbucket's website. It is possible to do it locally in a clone of the repo, but you'll need to use the option --allow-unrelated-histories in the git merge command.
These are the steps to do this:
1. Clone myrepo1
git clone https://myuser@bitbucket.org/myuser/myrepo1.git
2. Switch to the directory of the clone and add a second remote that points to myrepo
cd myrepo1
git remote add second-remote https://myuser@bitbucket.org/myuser/myrepo.git
3. Run the following command to fetch updates from both repos
git remote update
4. Let's assume you want to merge mybranch from myrepo into mybranch1 of myrepo1. Check out mybranch from myrepo
git checkout -b mybranch --track second-remote/mybranch
5. Check out mybranch1 of myrepo1 and then do the merge
git checkout mybranch1
git merge --allow-unrelated-histories mybranch
Kind regards,
Theodora
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.