CODEWITHSUNDEEP
androidgitgithubmergebitbucket
Vasile Doe
Vasile Doe

Reputation: 1754

Bitbucket merge branches confusion

I am new in using git, and I have a confusion about how to merge properly branches. I am using Android Studio integrated VCS, and each time I need to create new future I was adding a new branch. Like you can see in this pic:

enter image description here

I have following branches:

  1. Master

  2. download_web_content

  3. maintenance but never merge them.

So my confusion is how to merge last two into the master one and why my project doesn't look like: enter image description here

I was following official tutorial but did't get it...

p.s. Please don't mention SourceTree tool. I'd like to use Android Studio or Git Bash.

Upvotes: 0

Views: 277

Answers (1)

carstenbaumhoegger
carstenbaumhoegger

Reputation: 1645

Android Studio helps you to do merges inside the IDE.

Just follow these steps:

  • check out the branch that should have "all" features (in your case that should be "master")
  • click on the branches list and select your feature branch (e.g. download_web_content), click on it and select "merge"

Android Studio merges the changes for you and prompts conflicts if there are any.

Here is a small Tutorial that could also help :)

Hope this helps :)

Upvotes: 1

Related Questions