GRUMPHP - Git branch configuration

[omarlopesino]

This pull request attempts to limit the branch names to the normal ones used in projects by grumphp configuration.

It would allow to:

• Only create branches with common names: feature branches (fb), bug fixes (bf) and hotfixes (hf).
• Do not commit straight to sensitive branches as release or master, for that is better managing it by doing merge / pull requests

Please check, thanks!

[Eduardo-Morales-Alberti]

@mistermoper Could you provide official documentation or an article that defined that type of naming convention? maybe you could add documentation on a README or comment it on the grumphp file because each project have its own naming rules.

[Eduardo-Morales-Alberti]

@mistermoper The convention is changing, names like master should be main, for example.

[omarlopesino]

@Eduardo-Morales-Alberti documenting which branch names are used in the projects is not a responsibility of the boilerplate. The branch conventions depends on the git methodology used in each project, which can vary. This configuration will just provide a base.

I'll add a comment in the self grumphp.yml to let developers know that the branch named should be changed depending on the branch naming of their preference.

[juanjol]

@mistermoper In the backend cross learning, we have been talking about the current branch naming, and we have decided to use in future projects a naming similar to the one proposed in gitflow, organized in "folders" as feature/ or hotfix/ and with dev (or develop) and main as main branches. I understand that it is not the responsibility of boilerplate to set the name of the branches used, but it is the tool we use and I think it should be adapted to our work processes so we would have to reflect it in it, providing documentation on how this can be adapted to other workflows that may exist in other organizations. I think we should define this new naming and translate it into this PR.

[omarlopesino]

Ok I agree to change the name of the branches. As I''ve read in your message I should change:

• fb- to feature/
• hf- to hotfix/
• bf- to bugfix/
• dev to develop Right?

I will do that changes. Thanks for that suggestyions and remember for next times do suggestions in PR because currently I am not sure if you want me to change dev to develop but with a suggestion it is clear. Sometimes it is easier than writing a long explanation.

[omarlopesino]

I've done the changes requested, please review it and approve / merge if do you see it okay.

[jorgetutor]

Not sure if we should rename dev to develop. What is the most common practice nowadays? cc @rsanzante

[juanjol]

Thanks @mistermoper! I didn't do a suggestion because there is not yet an agreement about the definitive branch naming as @jorgetutor has said. I think that "dev" branch renaming could lead to complex changes in all our integrations and don't bring any noticeable improvement.

[jorgetutor]

After internal discuss we have agreed to move forward, thanks everyone!