Git merge develop into feature branch outputs Already up-to-date while it s not

Question

I checked out a feature branch from develop called branch-x  After a while other people pushed changes to the develop branch    I want to merge those changes into my branch-x  However if I do   git merge develop    it says  Already up-to-date  and doesn t allow me to merge    git diff develop shows that there are differences between branch-x and develop   How do I merge develop into branch-x

User · Answer

Step by step self explaining commands for update of feature branch with the latest code from origin  quot develop quot  branch  git checkout develop git pull -p git checkout feature branch git merge develop git push origin feature branch

User · Answer

Initially my repo said  Already up to date    MINGW64  feature Issue 123     git merge develop   Output    Already up to date    But the code is not up to date  amp  it is showing some differences in some files   MINGW64  feature Issue 123    git diff develop   Output    diff --git  a src main database sql additional pkg etl sql  b src main database sql additional pkg etl sql index ba2a257  1c219bb 100644 --- a src main database sql additional pkg etl sql     b src main database sql additional pkg etl sql   However  merging fixes it    MINGW64  feature Issue 123    git merge origin develop   Output    Updating c7c0ac9  09959e3 Fast-forward 3 files changed  157 insertions     92 deletions -    Again I have confirmed this by using diff command   MINGW64  feature Issue 123    git diff develop   No differences in the code now

User · Answer

git fetch  amp  amp  git merge origin develop

User · Answer

git pull origin develop   Since pulling a branch into another directly merges them together

User · Answer

You should first pull the changes from the develop branch and only then merge them to your branch   git checkout develop  git pull  git checkout branch-x git rebase develop   Or  when on branch-x   git fetch  amp  amp  git rebase origin develop     I have an alias that saves me a lot of time  Add to your    gitconfig    alias      fr     f     git fetch  amp  amp  git rebase origin   1      f    Now  all that you have to do is   git fr develop

[git] Git merge develop into feature branch outputs "Already up-to-date" while it's not

Examples related to git

Examples related to merge