Can't merge pull request in AWS CodeCommit. Complains there are conflicts, but remote and local are...
CodeComit doesn't merge pull request. Says there conflicts, but local and remote branches are up-to-date.
I'm able to create PR fine - CodeCommit says branches are mergeable.
But when I click [Merge], it says there are conflicts.
And both branches, remote and local, are up-to-date.
What behavior is this? How to solve?
git amazon-web-services aws-codecommit
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
add a comment |
CodeComit doesn't merge pull request. Says there conflicts, but local and remote branches are up-to-date.
I'm able to create PR fine - CodeCommit says branches are mergeable.
But when I click [Merge], it says there are conflicts.
And both branches, remote and local, are up-to-date.
What behavior is this? How to solve?
git amazon-web-services aws-codecommit
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
2
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11
add a comment |
CodeComit doesn't merge pull request. Says there conflicts, but local and remote branches are up-to-date.
I'm able to create PR fine - CodeCommit says branches are mergeable.
But when I click [Merge], it says there are conflicts.
And both branches, remote and local, are up-to-date.
What behavior is this? How to solve?
git amazon-web-services aws-codecommit
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
CodeComit doesn't merge pull request. Says there conflicts, but local and remote branches are up-to-date.
I'm able to create PR fine - CodeCommit says branches are mergeable.
But when I click [Merge], it says there are conflicts.
And both branches, remote and local, are up-to-date.
What behavior is this? How to solve?
git amazon-web-services aws-codecommit
git amazon-web-services aws-codecommit
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
asked Nov 16 '18 at 11:15
GreenGreen
8,02530103177
8,02530103177
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
2
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11
add a comment |
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
2
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
2
2
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11
add a comment |
0
active
oldest
votes
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%2f53336767%2fcant-merge-pull-request-in-aws-codecommit-complains-there-are-conflicts-but-r%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 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%2f53336767%2fcant-merge-pull-request-in-aws-codecommit-complains-there-are-conflicts-but-r%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
Are there realy no conflict? Try the merging locally and see if it runs successfully
– max630
Nov 18 '18 at 4:03
2
I also face this problem. There are actually no conflicts, it's actually the commits that are behind. Github I think manages it in a much better way. merging develop on my local into the branch and then pushing it again solves the problem for me.
– harsh_v
Dec 21 '18 at 7:11