F
F
FreeAero2019-10-13 07:44:11
git
FreeAero, 2019-10-13 07:44:11

How to make two pull requests with two branches?

Good afternoon, the question is, how will git behave in cases where I need to make 2 commits with two branches where editing takes place in one file? If roughly I am editing the header of the template, and in the next branch I am editing the footer template in this file, there may be a third branch as well. I have not tried it myself yet, maybe layering, where the second branch will overlap the first? Will the third overlap the first or the second?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Andrey, 2019-10-13
@FreeAero

if different commits changed the same line, then git will not be able to automerge.
and the one who will be the last to MERGE will receive a sif in the form of a message about the impossibility of automerge and he will have to pull from the master and merge it with his hands into his brunch

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question