Answer the question
In order to leave comments, you need to log in
How to organize work in git?
Tell me, how to organize work in git without using third-party tools like gitflow?
We have several people working on the project.
There is a master branch and a developer who takes on a new feature creates a branch from master, for example feature_1.
When he finished a feature, what is the right way to accept his changes? Now I merge from the feature branch to the master branch.
But there are difficulties: if you are working on several features at the same time, then you don’t know which branch is already ready and which is not yet. Here you need the developer to say: "I made a feature in such and such a branch." And if you don’t need to merge right now, but for example, in a few days? You have to look at the history on bitbucket and find out in which branch which commit was made.
Can you tell me how to accept changes from branches?
Answer the question
In order to leave comments, you need to log in
Correctly create a Pull Request on bitbucket. After it is reviewed and approved by one or more developers, it is merged into the master branch. As a result, there is less goblin in the code and you can always see who merged what in an accessible form. At least 146% work this way, the differences are mainly in the rules for accepting PR.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question