O
O
Outsider V.2020-04-02 16:16:12
git
Outsider V., 2020-04-02 16:16:12

How to use a local branch hidden from a remote repository?

We use the client repository on GitHub. We want to lead the development in advance, but not inform the client about it.
I created a local branch dev-hidden from the dev branch, and I commit the results of the work there. Then, when the customer approves the tasks and pays for them, I merge this branch into dev, remove dev-hidden, and push the dev commits to the client's github repo.
I tried this approach on a test repo in BitBucket and I didn't have any mention in my remote repo that the commits on the dev branch were previously dev-hidden and that those branches were merged. But in the case of the client turnip on GitHub, a surprise awaited me in the list of commits of the dev branch:

Merge branch 'dev-hiden' into dev

at the same time, there is no dev-hidden branch in this remote turnip.

Why did this happen, and how to avoid it 100%? Mergil via the PHPStorm GUI.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
D
Dmitry Gordinskiy, 2020-04-02
@DmitriyGordinskiy

Fast Forward Merge

D
Dmitry Belyaev, 2020-04-02
@bingo347

In addition to Fast Forward Merge, you can cherry-pick commits one at a time and create the illusion that you are actively working here and now

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question