0
I have a problem understanding GIT, whether the "master" branch is used for production and the "Development" branch for staging.
When I create a branch to work on a new Feature, create the "master" branch, do what needs to be done, upload the changes to the repository, and request a pull request for "Development", as some other developers are also in the same project, some conflict is to be expected.
In dealing with the conflict with git pull origin developmet my branch gets a merge of everything that was done in ''.
This is my problem, as I will merge into master later if my branch is code-coded from the other development branch?
But the master merge isn’t just done from the branch
development?– Woss
No, not everything in Velopment is valid to be in production, it is only for testing and validation of the project owners. When they agree to a change, I send my branch to master. What I’m doing is creating a new branch, copy and paste the code, and pull request to master. But I think this is very wrong, and very exhausting.
– Carlos Fagiani Jr
In another project where only I and another developer, we do so, we create a branch of master, I make the changes, I do a pull request in "Development", one warns the other, and only merge in 'master' if everything in 'Development' is OK, in that case the pull to the master exits from the Development. With two developers you can control, now a lot that is not even known.
– Carlos Fagiani Jr