How to make a merge of two git branches

-2

Assuming I have two branches one called stable and another called dev, and I have given commits in the dev branch. How do I merge it to the stable via command line ? thankful ;D

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

6

Possible duplicate of Merge development branch with master
– bruceskyaus
Nov 13 '18 at 4:12

Hello and welcome to StackOverflow. Please take some time to read the help page, especially the sections named "What topics can I ask about here?" and "What types of questions should I avoid asking?". And more importantly, please read the Stack Overflow question checklist. You might also want to learn about Minimal, Complete, and Verifiable Examples.
– Clijsters
Nov 13 '18 at 9:11

Take a look at git merge
– Clijsters
Nov 13 '18 at 9:12

add a comment |

-2

Assuming I have two branches one called stable and another called dev, and I have given commits in the dev branch. How do I merge it to the stable via command line ? thankful ;D

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

6

Possible duplicate of Merge development branch with master
– bruceskyaus
Nov 13 '18 at 4:12

Hello and welcome to StackOverflow. Please take some time to read the help page, especially the sections named "What topics can I ask about here?" and "What types of questions should I avoid asking?". And more importantly, please read the Stack Overflow question checklist. You might also want to learn about Minimal, Complete, and Verifiable Examples.
– Clijsters
Nov 13 '18 at 9:11

Take a look at git merge
– Clijsters
Nov 13 '18 at 9:12

add a comment |

-2

Assuming I have two branches one called stable and another called dev, and I have given commits in the dev branch. How do I merge it to the stable via command line ? thankful ;D

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

Assuming I have two branches one called stable and another called dev, and I have given commits in the dev branch. How do I merge it to the stable via command line ? thankful ;D

git merge git-merge

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

edited Nov 13 '18 at 4:29

JKostikiadis

2,04721121

asked Nov 13 '18 at 4:01

Jorge Rabello

asked Nov 13 '18 at 4:01

Jorge Rabello

asked Nov 13 '18 at 4:01

Jorge Rabello

6

Possible duplicate of Merge development branch with master
– bruceskyaus
Nov 13 '18 at 4:12

Hello and welcome to StackOverflow. Please take some time to read the help page, especially the sections named "What topics can I ask about here?" and "What types of questions should I avoid asking?". And more importantly, please read the Stack Overflow question checklist. You might also want to learn about Minimal, Complete, and Verifiable Examples.
– Clijsters
Nov 13 '18 at 9:11

Take a look at git merge
– Clijsters
Nov 13 '18 at 9:12

add a comment |

6

Possible duplicate of Merge development branch with master
– bruceskyaus
Nov 13 '18 at 4:12

Hello and welcome to StackOverflow. Please take some time to read the help page, especially the sections named "What topics can I ask about here?" and "What types of questions should I avoid asking?". And more importantly, please read the Stack Overflow question checklist. You might also want to learn about Minimal, Complete, and Verifiable Examples.
– Clijsters
Nov 13 '18 at 9:11

Take a look at git merge
– Clijsters
Nov 13 '18 at 9:12

Possible duplicate of Merge development branch with master
– bruceskyaus
Nov 13 '18 at 4:12

Hello and welcome to StackOverflow. Please take some time to read the help page, especially the sections named "What topics can I ask about here?" and "What types of questions should I avoid asking?". And more importantly, please read the Stack Overflow question checklist. You might also want to learn about Minimal, Complete, and Verifiable Examples.
– Clijsters
Nov 13 '18 at 9:11

Take a look at git merge
– Clijsters
Nov 13 '18 at 9:12

add a comment |

1 Answer
1

active

oldest

votes

This should work to merge dev into stable.

git checkout dev
git pull 
git checkout stable
git pull
git merge dev
git push

Don't forget to commit & push your changes on dev first

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

add a comment |

Your Answer

StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");

StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);

else
createEditor();

);

function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);

);

draft saved

draft discarded

StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53273592%2fhow-to-make-a-merge-of-two-git-branches%23new-answer', 'question_page');

);

Post as a guest

Name

Required, but never shown

1 Answer
1

active

oldest

votes

1 Answer
1

active

oldest

votes

This should work to merge dev into stable.

git checkout dev
git pull 
git checkout stable
git pull
git merge dev
git push

Don't forget to commit & push your changes on dev first

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

add a comment |

This should work to merge dev into stable.

git checkout dev
git pull 
git checkout stable
git pull
git merge dev
git push

Don't forget to commit & push your changes on dev first

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

add a comment |

This should work to merge dev into stable.

git checkout dev
git pull 
git checkout stable
git pull
git merge dev
git push

Don't forget to commit & push your changes on dev first

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

This should work to merge dev into stable.

git checkout dev
git pull 
git checkout stable
git pull
git merge dev
git push

Don't forget to commit & push your changes on dev first

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

edited Nov 13 '18 at 4:47

answered Nov 13 '18 at 4:08

Steven McConnon

960717

answered Nov 13 '18 at 4:08

Steven McConnon

960717

answered Nov 13 '18 at 4:08

Steven McConnon

960717

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

add a comment |

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

Why do you pull two times? A simple git merge should do the trick and is much faster.
– Clijsters
Nov 13 '18 at 8:59

And also: No one said that there is a remote.
– Clijsters
Nov 13 '18 at 9:11

Just helping a typical use case. If there is a remote, then you'll need to pull to make sure the local branches are up to date. If there is no remote then git checkout stable git merge dev
– Steven McConnon
Nov 14 '18 at 10:01

Yes, but one pull is enough. You don't need to pull two times.
– Clijsters
Nov 14 '18 at 14:04

add a comment |

draft saved

draft discarded

Thanks for contributing an answer to Stack Overflow!

Please be sure to answer the question. Provide details and share your research!

But avoid …

Asking for help, clarification, or responding to other answers.

Making statements based on opinion; back them up with references or personal experience.

To learn more, see our tips on writing great answers.

Some of your past answers have not been well-received, and you're in danger of being blocked from answering.

Please pay close attention to the following guidance:

Please be sure to answer the question. Provide details and share your research!

But avoid …

Asking for help, clarification, or responding to other answers.

Making statements based on opinion; back them up with references or personal experience.

To learn more, see our tips on writing great answers.

draft saved

draft discarded

Post as a guest

Name

Required, but never shown

Name

Required, but never shown

Name

Required, but never shown

This page is only for reference, If you need detailed information, please check here

搜尋此網誌

Myujth