Mixing
Git Merge indicates branch is already up to date
I'm trying to solve a Git merge issue. I have a Dev_R1 branch with a common.cs file and then another branch of Dev_R1 called B1. The same .cs file has been updated in branch B1 where a function has been re-written.
As I try to merge B1 into Dev_R1 it gives me the "Already up to date" message. I'm using gitlab extension in Visual Studio 2017 but would be okay with any command line options to solve the issue.
git gitlab
asked Jan 2 at 13:10
Ani MAni M
91
|
show 1 more comment
I'm trying to solve a Git merge issue. I have a Dev_R1 branch with a common.cs file and then another branch of Dev_R1 called B1. The same .cs file has been updated in branch B1 where a function has been re-written.
As I try to merge B1 into Dev_R1 it gives me the "Already up to date" message. I'm using gitlab extension in Visual Studio 2017 but would be okay with any command line options to solve the issue.
git gitlab
asked Jan 2 at 13:10
Ani MAni M
91
2
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
1
stackoverflow.com/…
– torek
Jan 2 at 13:20
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
1
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22
|
show 1 more comment
I'm trying to solve a Git merge issue. I have a Dev_R1 branch with a common.cs file and then another branch of Dev_R1 called B1. The same .cs file has been updated in branch B1 where a function has been re-written.
As I try to merge B1 into Dev_R1 it gives me the "Already up to date" message. I'm using gitlab extension in Visual Studio 2017 but would be okay with any command line options to solve the issue.
git gitlab
asked Jan 2 at 13:10
Ani MAni M
91
I'm trying to solve a Git merge issue. I have a Dev_R1 branch with a common.cs file and then another branch of Dev_R1 called B1. The same .cs file has been updated in branch B1 where a function has been re-written.
As I try to merge B1 into Dev_R1 it gives me the "Already up to date" message. I'm using gitlab extension in Visual Studio 2017 but would be okay with any command line options to solve the issue.
git gitlab
git gitlab
asked Jan 2 at 13:10
Ani MAni M
91
asked Jan 2 at 13:10
Ani MAni M
91
asked Jan 2 at 13:10
Ani MAni M
91
asked Jan 2 at 13:10
Ani MAni M
91
asked Jan 2 at 13:10
Ani MAni M
91
91
2
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
1
stackoverflow.com/…
– torek
Jan 2 at 13:20
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
1
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22
|
show 1 more comment
2
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
1
stackoverflow.com/…
– torek
Jan 2 at 13:20
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
1
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22
2
2
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
1
1
stackoverflow.com/…
– torek
Jan 2 at 13:20
stackoverflow.com/…
– torek
Jan 2 at 13:20
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
1
1
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22
|
show 1 more 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%2f54006982%2fgit-merge-indicates-branch-is-already-up-to-date%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%2f54006982%2fgit-merge-indicates-branch-is-already-up-to-date%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
2
where in the graph in relation to each other do these branches reside?
– Liam
Jan 2 at 13:13
1
stackoverflow.com/…
– torek
Jan 2 at 13:20
Dev_R1 is a parent of B1 branch while Dev_R1 is a child of master. Also I don't want to repalce the file in Dev_R1 as this might mess up work from others
– Ani M
Jan 2 at 13:22
1
Branches do not have parent/child relationships. Only commits have parent/child relationships.
– torek
Jan 2 at 14:09
Can you give us a graph view of the commits (preferably simplified)?
– evolutionxbox
Jan 2 at 22:22