Cannot get other developer's branch on my team

Question

I am working on the following repo with another developer.

https://github.com/practicia1234/Practicia

my branch is devSam and his branch is devSubu. Whenever he makes a new commit and pushes his code, i would like to go to his branch, pull a local version on my computer, and work on that and then push the code to my branch.

Here are the git commands i follow:

-git checkout devSubu
git pull
git checkout devSam
git merge devSubu
(//work on devSam)
git push devSam

when i am on the step "git merge devSubu" above, i get the following message and the code has not merged at all

Already up-to-date.

However, i know that my branch is not merged with devSubu and my code looks like it would on my branch, not on devSubu branch.

What am i doing wrong?

Thanks!

score 1 · Answer 1 · answered Jan 19 '18 at 05:48

First, quick tip, you don't have to maintain a local branch devSubu, which would forces you to checkout, pull, before getting back to your own branch.

Without leaving your branch, you can at any time do:

git fetch
git merge origin/devSubu

Second, if the merge reports "Already up-to-date" (as seen here), that means there is no new commits to merge into your branch.

score 0 · Answer 2 · edited Jan 19 '18 at 08:22

0

I'm try on the local, uses your steps. No problem! Check your steps：

git checkout devSubu
git pull
git checkout devSam
git merge devSubu
git push devSam

edited Jan 19 '18 at 08:22

Hiren Gohel

4,942
6
29
48

answered Jan 19 '18 at 07:25

ixx

1

Cannot get other developer's branch on my team

2 Answers2