Git rejects push after reordering commits
I had been working on 2 features of a project, on the master branch.
Let's call them Feature #1 and Feature #2.
The Feature #2 commit is the most recent.
None of the commits was pushed to remote until it was time to push the Feature #2 commit.
But the attempt to push the latest commit with
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master
would push the previous commit too, unless I reordered them.
So I reordered the commits (using git rebase -i HEAD~2).
I have git pulled and git status gives the message:
Your branch is ahead of 'origin/master' by 2 commits.
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master is rejected:
Updates were rejected because the tip of your current branch is behind
What shall I do?
What is the source of this problem?
git github push
asked Nov 12 at 15:50
Razvan Zamfir
8181956
|
show 3 more comments
I had been working on 2 features of a project, on the master branch.
Let's call them Feature #1 and Feature #2.
The Feature #2 commit is the most recent.
None of the commits was pushed to remote until it was time to push the Feature #2 commit.
But the attempt to push the latest commit with
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master
would push the previous commit too, unless I reordered them.
So I reordered the commits (using git rebase -i HEAD~2).
I have git pulled and git status gives the message:
Your branch is ahead of 'origin/master' by 2 commits.
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master is rejected:
Updates were rejected because the tip of your current branch is behind
What shall I do?
What is the source of this problem?
git github push
asked Nov 12 at 15:50
Razvan Zamfir
8181956
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output ofgit log --graph --oneline --decorate --all.
– Makoto
Nov 12 at 15:54
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34
|
show 3 more comments
I had been working on 2 features of a project, on the master branch.
Let's call them Feature #1 and Feature #2.
The Feature #2 commit is the most recent.
None of the commits was pushed to remote until it was time to push the Feature #2 commit.
But the attempt to push the latest commit with
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master
would push the previous commit too, unless I reordered them.
So I reordered the commits (using git rebase -i HEAD~2).
I have git pulled and git status gives the message:
Your branch is ahead of 'origin/master' by 2 commits.
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master is rejected:
Updates were rejected because the tip of your current branch is behind
What shall I do?
What is the source of this problem?
git github push
asked Nov 12 at 15:50
Razvan Zamfir
8181956
I had been working on 2 features of a project, on the master branch.
Let's call them Feature #1 and Feature #2.
The Feature #2 commit is the most recent.
None of the commits was pushed to remote until it was time to push the Feature #2 commit.
But the attempt to push the latest commit with
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master
would push the previous commit too, unless I reordered them.
So I reordered the commits (using git rebase -i HEAD~2).
I have git pulled and git status gives the message:
Your branch is ahead of 'origin/master' by 2 commits.
git push origin ab34567dff766d0b5bd8698faffcfacf937e06d4:master is rejected:
Updates were rejected because the tip of your current branch is behind
What shall I do?
What is the source of this problem?
git github push
git github push
asked Nov 12 at 15:50
Razvan Zamfir
8181956
asked Nov 12 at 15:50
Razvan Zamfir
8181956
edited Nov 12 at 17:11
asked Nov 12 at 15:50
Razvan Zamfir
8181956
asked Nov 12 at 15:50
Razvan Zamfir
8181956
asked Nov 12 at 15:50
Razvan Zamfir
8181956
8181956
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output ofgit log --graph --oneline --decorate --all.
– Makoto
Nov 12 at 15:54
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34
|
show 3 more comments
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output ofgit log --graph --oneline --decorate --all.
– Makoto
Nov 12 at 15:54
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output of
git log --graph --oneline --decorate --all.– Makoto
Nov 12 at 15:54
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output of
git log --graph --oneline --decorate --all.– Makoto
Nov 12 at 15:54
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34
|
show 3 more comments
1 Answer
1
active
oldest
votes
As per my understanding from your comment that local master is perfect and you want to make the remote to be in same as local then you can try.
git push --force
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
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
});
}
});
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%2f53265649%2fgit-rejects-push-after-reordering-commits%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
As per my understanding from your comment that local master is perfect and you want to make the remote to be in same as local then you can try.
git push --force
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
add a comment |
As per my understanding from your comment that local master is perfect and you want to make the remote to be in same as local then you can try.
git push --force
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
add a comment |
As per my understanding from your comment that local master is perfect and you want to make the remote to be in same as local then you can try.
git push --force
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
As per my understanding from your comment that local master is perfect and you want to make the remote to be in same as local then you can try.
git push --force
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
answered Nov 12 at 16:46
Samuel J Mathew
3,43412228
3,43412228
add a comment |
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.
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.
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%2f53265649%2fgit-rejects-push-after-reordering-commits%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
It seems incredibly suspicious that you have a branch that looks like a SHA. Show us the output of
git log --graph --oneline --decorate --all.– Makoto
Nov 12 at 15:54
@Makoto I have followed this tiutorial.
– Razvan Zamfir
Nov 12 at 16:09
@Makoko, that's not a branch. That's the id of a revision he wants to hold on a remote branch.
– eftshift0
Nov 12 at 16:29
i.imgur.com/1sB3a0T.png
– Jiri Kremser
Nov 12 at 16:34
@RazvanZamfir are you sure that your local master branch is correct
– Samuel J Mathew
Nov 12 at 16:34