Mixing
When should I use git pull --rebase instead of git pull?
I have a local commit [A] and a branch which points at commit [B]. I need to pull changes before pushing the commit.
Scenario 1:
Changes of commit [A] do not affect anything changed on commit [B]
git pull should be fine, pull should not overwrite anything. Same for using git pull --rebase.
Scenario 2:
Changes of commit [A] and commit [B] affect the same file
git pull should be fine, git should automerge everything. Same for using git pull --rebase.
Scenario 3:
Changes (or deletions) of commit [A] and commit [B] affect the lines of code.
git pull results into merge conflicts which I need to remove manually. Same for using git pull --rebase.
Am I wrong? In which cases I need to use git pull --rebase ? If you pull changes you need to rebase the commit anyway, either by auto merge, no merge or solving merge conflicts.
git
asked Jan 2 at 20:10
elpelp
364116
add a comment |
I have a local commit [A] and a branch which points at commit [B]. I need to pull changes before pushing the commit.
Scenario 1:
Changes of commit [A] do not affect anything changed on commit [B]
git pull should be fine, pull should not overwrite anything. Same for using git pull --rebase.
Scenario 2:
Changes of commit [A] and commit [B] affect the same file
git pull should be fine, git should automerge everything. Same for using git pull --rebase.
Scenario 3:
Changes (or deletions) of commit [A] and commit [B] affect the lines of code.
git pull results into merge conflicts which I need to remove manually. Same for using git pull --rebase.
Am I wrong? In which cases I need to use git pull --rebase ? If you pull changes you need to rebase the commit anyway, either by auto merge, no merge or solving merge conflicts.
git
asked Jan 2 at 20:10
elpelp
364116
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31
add a comment |
I have a local commit [A] and a branch which points at commit [B]. I need to pull changes before pushing the commit.
Scenario 1:
Changes of commit [A] do not affect anything changed on commit [B]
git pull should be fine, pull should not overwrite anything. Same for using git pull --rebase.
Scenario 2:
Changes of commit [A] and commit [B] affect the same file
git pull should be fine, git should automerge everything. Same for using git pull --rebase.
Scenario 3:
Changes (or deletions) of commit [A] and commit [B] affect the lines of code.
git pull results into merge conflicts which I need to remove manually. Same for using git pull --rebase.
Am I wrong? In which cases I need to use git pull --rebase ? If you pull changes you need to rebase the commit anyway, either by auto merge, no merge or solving merge conflicts.
git
asked Jan 2 at 20:10
elpelp
364116
I have a local commit [A] and a branch which points at commit [B]. I need to pull changes before pushing the commit.
Scenario 1:
Changes of commit [A] do not affect anything changed on commit [B]
git pull should be fine, pull should not overwrite anything. Same for using git pull --rebase.
Scenario 2:
Changes of commit [A] and commit [B] affect the same file
git pull should be fine, git should automerge everything. Same for using git pull --rebase.
Scenario 3:
Changes (or deletions) of commit [A] and commit [B] affect the lines of code.
git pull results into merge conflicts which I need to remove manually. Same for using git pull --rebase.
Am I wrong? In which cases I need to use git pull --rebase ? If you pull changes you need to rebase the commit anyway, either by auto merge, no merge or solving merge conflicts.
git
git
asked Jan 2 at 20:10
elpelp
364116
asked Jan 2 at 20:10
elpelp
364116
asked Jan 2 at 20:10
elpelp
364116
asked Jan 2 at 20:10
elpelp
364116
asked Jan 2 at 20:10
elpelp
364116
364116
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31
add a comment |
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31
add a comment |
1 Answer
1
active
oldest
votes
You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
add a comment |
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
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f54012539%2fwhen-should-i-use-git-pull-rebase-instead-of-git-pull%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
add a comment |
You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
add a comment |
You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
answered Jan 2 at 20:15
SchleisSchleis
25.9k34974
25.9k34974
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
add a comment |
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
Good point! Thank you, that makes sense :)
– elp
Jan 2 at 20:17
add a comment |
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.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f54012539%2fwhen-should-i-use-git-pull-rebase-instead-of-git-pull%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
stackoverflow.com/questions/2472254/…
– phd
Jan 2 at 20:37
stackoverflow.com/questions/18930527/…
– phd
Jan 2 at 20:38
stackoverflow.com/…
– phd
Jan 2 at 20:38
I almost got it, could you post at least one more?
– elp
Jan 2 at 21:31