SourceTree won't let me squash and merge my branch
I’m working in SourceTree and I’m trying to squash commit a branch into another branch. I’m told I can squash by going into interactive rebase. So I’m trying to do that. I get this message:
If I just accept the commit message, it does nothing (I’m expecting the interactive rebase dialog to come up). My guess is that it’s trying to rebase from 93a74a2e to 93a74a2e onto 93a74a2e (i.e. rebase one commit into itself). Since there’s only one commit, it figures there’s nothing to do so it just ends.
The branch I want to squash is the blue one below:
Is it because of that merge from the red branch right below the head that I can’t rebase (and therefore squash) anything before 93a74a2e?
What if I want to squash everything in the blue branch between a past commit (not shown in the branch screen shot) and the head, and then merge that squashed commit (ONLY the squashed commit) to another branch (also not shown)?
I’ve done this before on the command line like so:
git checkout destinationBranch
git merge --squash sourceBranch && git commit -m ‘squash merging from sourceBranch’
But it halts before it commits and asks me to commit it as a separate step. This resulted (I think) in seeing no merge in the SourceTree branch graph (I think it just saw the commit as changes in the branch as opposed to a merge). So I’m trying it through SourceTree this time.
git commit
edited Feb 15 at 17:36
Mr Shunz
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
add a comment |
I’m working in SourceTree and I’m trying to squash commit a branch into another branch. I’m told I can squash by going into interactive rebase. So I’m trying to do that. I get this message:
If I just accept the commit message, it does nothing (I’m expecting the interactive rebase dialog to come up). My guess is that it’s trying to rebase from 93a74a2e to 93a74a2e onto 93a74a2e (i.e. rebase one commit into itself). Since there’s only one commit, it figures there’s nothing to do so it just ends.
The branch I want to squash is the blue one below:
Is it because of that merge from the red branch right below the head that I can’t rebase (and therefore squash) anything before 93a74a2e?
What if I want to squash everything in the blue branch between a past commit (not shown in the branch screen shot) and the head, and then merge that squashed commit (ONLY the squashed commit) to another branch (also not shown)?
I’ve done this before on the command line like so:
git checkout destinationBranch
git merge --squash sourceBranch && git commit -m ‘squash merging from sourceBranch’
But it halts before it commits and asks me to commit it as a separate step. This resulted (I think) in seeing no merge in the SourceTree branch graph (I think it just saw the commit as changes in the branch as opposed to a merge). So I’m trying it through SourceTree this time.
git commit
edited Feb 15 at 17:36
Mr Shunz
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
add a comment |
I’m working in SourceTree and I’m trying to squash commit a branch into another branch. I’m told I can squash by going into interactive rebase. So I’m trying to do that. I get this message:
If I just accept the commit message, it does nothing (I’m expecting the interactive rebase dialog to come up). My guess is that it’s trying to rebase from 93a74a2e to 93a74a2e onto 93a74a2e (i.e. rebase one commit into itself). Since there’s only one commit, it figures there’s nothing to do so it just ends.
The branch I want to squash is the blue one below:
Is it because of that merge from the red branch right below the head that I can’t rebase (and therefore squash) anything before 93a74a2e?
What if I want to squash everything in the blue branch between a past commit (not shown in the branch screen shot) and the head, and then merge that squashed commit (ONLY the squashed commit) to another branch (also not shown)?
I’ve done this before on the command line like so:
git checkout destinationBranch
git merge --squash sourceBranch && git commit -m ‘squash merging from sourceBranch’
But it halts before it commits and asks me to commit it as a separate step. This resulted (I think) in seeing no merge in the SourceTree branch graph (I think it just saw the commit as changes in the branch as opposed to a merge). So I’m trying it through SourceTree this time.
git commit
edited Feb 15 at 17:36
Mr Shunz
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
I’m working in SourceTree and I’m trying to squash commit a branch into another branch. I’m told I can squash by going into interactive rebase. So I’m trying to do that. I get this message:
If I just accept the commit message, it does nothing (I’m expecting the interactive rebase dialog to come up). My guess is that it’s trying to rebase from 93a74a2e to 93a74a2e onto 93a74a2e (i.e. rebase one commit into itself). Since there’s only one commit, it figures there’s nothing to do so it just ends.
The branch I want to squash is the blue one below:
Is it because of that merge from the red branch right below the head that I can’t rebase (and therefore squash) anything before 93a74a2e?
What if I want to squash everything in the blue branch between a past commit (not shown in the branch screen shot) and the head, and then merge that squashed commit (ONLY the squashed commit) to another branch (also not shown)?
I’ve done this before on the command line like so:
git checkout destinationBranch
git merge --squash sourceBranch && git commit -m ‘squash merging from sourceBranch’
But it halts before it commits and asks me to commit it as a separate step. This resulted (I think) in seeing no merge in the SourceTree branch graph (I think it just saw the commit as changes in the branch as opposed to a merge). So I’m trying it through SourceTree this time.
git commit
git commit
edited Feb 15 at 17:36
Mr Shunz
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
edited Feb 15 at 17:36
Mr Shunz
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
edited Feb 15 at 17:36
Mr Shunz
1,84712017
edited Feb 15 at 17:36
Mr Shunz
1,84712017
edited Feb 15 at 17:36
Mr Shunz
1,84712017
1,84712017
asked Feb 15 at 16:48
user998818user998818
11
asked Feb 15 at 16:48
user998818user998818
11
asked Feb 15 at 16:48
user998818user998818
11
11
add a comment |
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "3"
};
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%2fsuperuser.com%2fquestions%2f1406175%2fsourcetree-wont-let-me-squash-and-merge-my-branch%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Super User!
- 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%2fsuperuser.com%2fquestions%2f1406175%2fsourcetree-wont-let-me-squash-and-merge-my-branch%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
