K
K
klinnov2017-02-06 20:45:28
git
klinnov, 2017-02-06 20:45:28

How to switch between branches correctly?

Hello!
A question. I have a separate thread for each task.
For example, I have a task that consists of 3 branches, i.e. on one I can't I need to break it into three separate ones. How can I work for example on branch 2 with changes from the first branch if it is not yet merged with the master branch?
I tried rebase, but then changes from branch 1 also get into the pull.
And you need only changes from branch 2 (for example) to get into the pool.
Thank you!

Answer the question

In order to leave comments, you need to log in

3 answer(s)
S
Sly_tom_cat ., 2017-02-07
@Sly_tom_cat

It is not clear what is the question?
Well, I have master, dev (leaving the master ahead by several commits), and bug#48 (leaving dev by a couple of commits). If I need a fix from bug#48 to dev then I'll merge bug#48 to dev. What is the difficulty and why is there a rebase?

0
0xD34F, 2017-09-16
@User782

SELECT r.id, r.text, h.iduser
FROM history h
JOIN review r ON r.id = h.hisuser
WHERE h.iduser = '{определенный id}'

C
Chronic 86, 2017-09-16
@chronic86

You are confusing the union of queries a little, and the query from several tables. You have been given the solution above.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question