problems with Git between multiple branches

Question

problems with Git between multiple branches

Navigation

#1 by (0 votes)

0

Recently the dev told me that I had uploaded other files than the ones I had to upload, that is to say I uploaded the classes I had to work on and other ones were left but I never gave them add and it is strange p>

I have the following structure:

Rama1, MiRama and master

Rama1 has a master copy.

MiRama has a copy of Rama1

I have always been working on MiRama developing my code ...

Now you could tell me what the code structure would be like to send my MiRama code to Rama1 ... Let it be with git pull and git push to see what it failed (keep in mind that sometimes they upload code to master and you have to pull it)

git git-push

asked by BlackWidow 10.05.2018 в 21:58

source

1 answer

Comparison of twig variables in if batch ftp windows server

score 0 · Answer 1

It depends on the standards of your company, which according to what I understand is that there has not been a Merge "MiRama" to the master (it should not be, since it must go through a quality control).

Likewise I understood that some branches are protected (ideally), therefore you must request a "Pull Request".

To perform a Merge, first of all you must request a Pull Request from "MiRama" to "Rama1"

git add .
git commit -m "Mis cambios"
git push origin MiRama

Subsequently the software or platform that you use to manage your version control (such as GitLab, GitHub, among others ...), you must make a Pull Request which you request to perform a Merge of: "MiRama" a "Rama1", assigning the corresponding quality control user. ( Eye in this step there may be conflicts, if there is one, I recommend you solve it)

Then you must wait for that user to accept the changes and perform the Merge of your branch to Rama1, in case the user rejects it, you must request information or reason for rejection, so that you can do it better and return to make another pull request.

Finally, the person in charge of Rama1 must request a pull request to include the respective changes to the Master branch.