Ggtcf

Rotate ASCII Art by 45 Degrees

Does the Idaho Potato Commission associate potato skins with healthy eating?

Bullying boss launched a smear campaign and made me unemployable

files created then deleted at every second in tmp directory

Is it "common practice in Fourier transform spectroscopy to multiply the measured interferogram by an apodizing function"? If so, why?

How to show a landlord what we have in savings?

Ambiguity in the definition of entropy

How obscure is the use of 令 in 令和?

ssTTsSTtRrriinInnnnNNNIiinngg

What is the fastest integer factorization to break RSA?

How can saying a song's name be a copyright violation?

How to stretch the corners of this image so that it looks like a perfect rectangle?

Is it inappropriate for a student to attend their mentor's dissertation defense?

How do conventional missiles fly?

Am I breaking OOP practice with this architecture?

Avoiding the "not like other girls" trope?

How to compactly explain secondary and tertiary characters without resorting to stereotypes?

What's the meaning of "Sollensaussagen"?

What is the opposite of "eschatology"?

Do Iron Man suits sport waste management systems?

Should I tell management that I intend to leave due to bad software development practices?

What do you call someone who asks many questions?

What historical events would have to change in order to make 19th century "steampunk" technology possible?

How much mains leakage does an Ethernet connection to a PC induce, and what is the operating leakage path?

git pull not updating a branch with merged branches

How to clone all remote branches in Git?What is the difference between 'git pull' and 'git fetch'?How to undo 'git add' before commit?How do I undo the most recent commits in Git?How do I force “git pull” to overwrite local files?How do I check out a remote Git branch?How do I delete a Git branch locally and remotely?Make the current Git branch a master branchHow do I rename a local Git branch?Git fetch remote branch

1

I am having a problem with git. So,there was one new branch(a) that was committed for review. While it was in review, another branch was created (b). Branch a was merged into the main branch dev from which a and b were created.

Now in branch b, there are some code that is present in branch a that can be used. I pulled dev branch and I did get the merged code.But when I check out to branch b to finish, those changes that were in branch a and merge into dev don't appear.

I am pretty sure I screwed up the git flow. How can branch b which is created out of dev branch those merged changes of branch a?

git github

share|improve this question

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  did you try git checkout branch b && git pull origin dev
  
  – Govind Parashar
  Mar 8 at 21:06
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  oh let me try Govind
  
  – Nie Selam
  Mar 8 at 21:29
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Worked like a charm Govind, thank you. But let me accept the below as an answer; it explained a few more things clearly, dont you agree?
  
  – Nie Selam
  Mar 12 at 20:49
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Welcome @Nie Selam. I don't mind. I happy about your problem has been resolved
  
  – Govind Parashar
  Mar 12 at 21:02
  

  
  
  
  

add a comment | 

1

I am having a problem with git. So,there was one new branch(a) that was committed for review. While it was in review, another branch was created (b). Branch a was merged into the main branch dev from which a and b were created.

Now in branch b, there are some code that is present in branch a that can be used. I pulled dev branch and I did get the merged code.But when I check out to branch b to finish, those changes that were in branch a and merge into dev don't appear.

I am pretty sure I screwed up the git flow. How can branch b which is created out of dev branch those merged changes of branch a?

git github

share|improve this question

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  did you try git checkout branch b && git pull origin dev
  
  – Govind Parashar
  Mar 8 at 21:06
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  oh let me try Govind
  
  – Nie Selam
  Mar 8 at 21:29
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Worked like a charm Govind, thank you. But let me accept the below as an answer; it explained a few more things clearly, dont you agree?
  
  – Nie Selam
  Mar 12 at 20:49
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Welcome @Nie Selam. I don't mind. I happy about your problem has been resolved
  
  – Govind Parashar
  Mar 12 at 21:02
  

  
  
  
  

add a comment | 

I am having a problem with git. So,there was one new branch(a) that was committed for review. While it was in review, another branch was created (b). Branch a was merged into the main branch dev from which a and b were created.

Now in branch b, there are some code that is present in branch a that can be used. I pulled dev branch and I did get the merged code.But when I check out to branch b to finish, those changes that were in branch a and merge into dev don't appear.

I am pretty sure I screwed up the git flow. How can branch b which is created out of dev branch those merged changes of branch a?

git github

share|improve this question

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

share|improve this question

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

share|improve this question

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

asked Mar 8 at 20:56

Nie SelamNie Selam

485417

1 Answer
1

active

oldest

votes

2

This is expected, Git branches are a way of working on a single code base by multiple people at the same time. To do this; it uses code base state at a given time as a reference. So when you branch b of dev was at a certain that was different from the branch a.

Following should be something when you the branches look like when you create the new branch B(2)

 /------- A ---------
----(1)---- Dev ---(2)-----------------
 --------- B -----

Now somewhere along the line the branch A is merged back to Dev(3). So this should be what the branch should look like

 /------- A ----------
----(1)---- Dev ---(2)----(3)----------------
 --------- B -----------

Now when you're on the Dev branch, it knows about the changes from A(3) since it been merged back.

But branch B don't know about this as it merged off from Dev(2) before the branch A(3) merged back.

To get the branch B inline with Dev, you've two options now.

1. Merged Dev into B. git checkout b; git merged dev
   


2. Rebase Dev on to B. git checkout b; git pull --rebase origin dev. Don't recommend this if you're a noob to git. It can sometimes go wrong in a hurry.

share|improve this answer

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

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
);



);

draft saved

draft discarded

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

Name

Email

Required, but never shown

StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55070880%2fgit-pull-not-updating-a-branch-with-merged-branches%23new-answer', 'question_page');

);

Post as a guest

Name

Email

Required, but never shown

2

This is expected, Git branches are a way of working on a single code base by multiple people at the same time. To do this; it uses code base state at a given time as a reference. So when you branch b of dev was at a certain that was different from the branch a.

Following should be something when you the branches look like when you create the new branch B(2)

 /------- A ---------
----(1)---- Dev ---(2)-----------------
 --------- B -----

Now somewhere along the line the branch A is merged back to Dev(3). So this should be what the branch should look like

 /------- A ----------
----(1)---- Dev ---(2)----(3)----------------
 --------- B -----------

Now when you're on the Dev branch, it knows about the changes from A(3) since it been merged back.

But branch B don't know about this as it merged off from Dev(2) before the branch A(3) merged back.

To get the branch B inline with Dev, you've two options now.

1. Merged Dev into B. git checkout b; git merged dev
   


2. Rebase Dev on to B. git checkout b; git pull --rebase origin dev. Don't recommend this if you're a noob to git. It can sometimes go wrong in a hurry.

share|improve this answer

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

add a comment | 

2

This is expected, Git branches are a way of working on a single code base by multiple people at the same time. To do this; it uses code base state at a given time as a reference. So when you branch b of dev was at a certain that was different from the branch a.

Following should be something when you the branches look like when you create the new branch B(2)

 /------- A ---------
----(1)---- Dev ---(2)-----------------
 --------- B -----

Now somewhere along the line the branch A is merged back to Dev(3). So this should be what the branch should look like

 /------- A ----------
----(1)---- Dev ---(2)----(3)----------------
 --------- B -----------

Now when you're on the Dev branch, it knows about the changes from A(3) since it been merged back.

But branch B don't know about this as it merged off from Dev(2) before the branch A(3) merged back.

To get the branch B inline with Dev, you've two options now.

1. Merged Dev into B. git checkout b; git merged dev
   


2. Rebase Dev on to B. git checkout b; git pull --rebase origin dev. Don't recommend this if you're a noob to git. It can sometimes go wrong in a hurry.

share|improve this answer

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

add a comment | 

This is expected, Git branches are a way of working on a single code base by multiple people at the same time. To do this; it uses code base state at a given time as a reference. So when you branch b of dev was at a certain that was different from the branch a.

Following should be something when you the branches look like when you create the new branch B(2)

 /------- A ---------
----(1)---- Dev ---(2)-----------------
 --------- B -----

Now somewhere along the line the branch A is merged back to Dev(3). So this should be what the branch should look like

 /------- A ----------
----(1)---- Dev ---(2)----(3)----------------
 --------- B -----------

Now when you're on the Dev branch, it knows about the changes from A(3) since it been merged back.

But branch B don't know about this as it merged off from Dev(2) before the branch A(3) merged back.

To get the branch B inline with Dev, you've two options now.

1. Merged Dev into B. git checkout b; git merged dev
   


2. Rebase Dev on to B. git checkout b; git pull --rebase origin dev. Don't recommend this if you're a noob to git. It can sometimes go wrong in a hurry.

share|improve this answer

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

 /------- A ---------
----(1)---- Dev ---(2)-----------------
 --------- B -----

 /------- A ----------
----(1)---- Dev ---(2)----(3)----------------
 --------- B -----------

share|improve this answer

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718

answered Mar 8 at 22:43

Praveen PremaratnePraveen Premaratne

1,4421718