bitbucket - best way for splitting poject using git features like branching

Question

i have a project which is in bitbucket

some work/bug fix is going on in master branch

this is in both live server and test server

now client want a new feature which we should not push to live server

he want to test new feature in test server only

but at same time bug fix he has to test in test server and after that live server we have to push daily to live server for bug fix

how can i achive this using git branching/or any other git features

i am completely new to git etc i just have coding knowledge in php/python

Answer 1

Let's assume your production branch is master and your test branch is test.

You can have a hotfix branch based on master too.

when you want to commit something on the test server, just commit it on the test branch. and when you have a bugfix commit it in the hotfix branch and then merge it with both master and test.

By the way, this is not the only solution.