How do I update a parent branch without deleting the clild one in git?

Question

I know this was answered somewhere but I cannot find the right wording. The question is: If I have a master branch and a master/branch1 branch, and I have commits in it like this:

c c
| |
c c
| |
|/  c = commit

How can I do something like tihis?

c c
| |
c c
|\|
c c
| |
c c
| |
|/

And when I do merge gitKraken shows this:

c
|\
c c
| |
c c
| |
c/

So can I checkout the clild branch after I have merged it? Side question: If merge does not delete the child branch, how do I?

score 0 · Accepted Answer · answered Sep 21 '20 at 06:06

0

Merging won't delete the child branch.
gitKraken simply focus on your current branch master and shows all the reachable commits from the mast (merge) commit on master.

If you switch back to the child branch, you would find again the more recent commits (done after the merge), and you can go on working on that branch.

answered Sep 21 '20 at 06:06

VonC

1,262,500
529
4,410
5,250

Thanks but, how do I delete the branch then after I do merge? – Leo Sep 21 '20 at 19:15
@Leo Merge or not, you can delete a branch at any time: https://stackoverflow.com/a/44714712/6309 – VonC Sep 21 '20 at 19:59

How do I update a parent branch without deleting the clild one in git?

1 Answers1