A
A
Alexander Urich2018-10-31 17:35:44
git
Alexander Urich, 2018-10-31 17:35:44

Did git rebase instead of merge?

They started working with git just a month ago, before that they worked with svn for several years.
The development process turned out like this:
3 main branches: dev, test, master
When a task arrives at the developer, it creates a new branch with the name of this task. Then when he did everything, he pushes this branch to origin, and the "senior" developer checks the code. If everything is OK, then this branch is merged into the dev branch, where the task is checked by an analyst. Then, if the analyst decides that everything is OK, this branch is merged into the test branch, where the tester checks everything. If everything is OK, then test is simply merged in master (in fact, the branches must be identical).
Maybe this development process is wrong, but we decided to do it that way.
The problem is that one of the developers in the dev branch, instead of merging a branch with a task, did a rebase, and now when merging into the test of any branch, all the past ones fly into it, and this is not necessary because the business does not need those tasks that were done on the maiden
What to do, how to be?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
W
wlbm_onizuka, 2018-11-01
@wlbm_onizuka

when you rebase, the commit hashes change
, you have the same commits with different hashes in different branches,
you need to reset the hard of one branch to another and push with force

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question