E
E
Evgeny Startsev2017-12-20 13:20:23
laptops
Evgeny Startsev, 2017-12-20 13:20:23

How to merge one branch into different git branches?

The bottom line is that there is a master and dev (this is already clear)))
there are several tasks: for example, "edits # 3" and "edits # 4"
created separate branches for them (on the 1st branch per task)
Completed the task "edits #3" uploaded, uploaded to dev for testing. I started to perform "edits #4", completed it...
But here the problem needs to be put on the "edits #4" test (for the tester to check), and also put on the "edits #3" master,
while "edits #4" did not get into the master. In addition, edits #3 on the test should remain.
Actually, the question is whether it is possible to merge the "edits #3" branch to the dev branch and then separately merge the branch into master?
Or are there other solutions to this problem?
I'm sorry if the question is stupid)))

Answer the question

In order to leave comments, you need to log in

3 answer(s)
D
dollar, 2019-10-10
@Dwellss

You can exactly 16 GB according to the specification.
It is better to take not 1333, but DDR3L SDRAM (1600 MHz) according to the same specification from the official site.
And don't be afraid to experiment. Memory sometimes does not fit, so almost all normal stores take it back.

E
Evgeny Startsev, 2017-12-20
@jey_val_star

damn, while writing the question, I came up with a solution, just after uploading "edit # 3" in dev, create a new branch from dev and switch the test to this branch)))

E
Egor Zhivagin, 2017-12-20
@Krasnodar_etc

Uploaded "edits 3" to dev --> tested --> merged dev into master
Then uploaded edits 4

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question