CODEWITHSUNDEEP
gitgit-rebase
MD10
MD10

Reputation: 1531

get changes without fast-forwarding

enter image description here

I want to get the changes that are in origin/master into my search-players-algorithm branch without getting the search-players-algorithm branch above the master.In other words I want to update my search-players-algorithm branch and keep it the same place. Is it possible ? I have tried git merge origin/master --no-ff but it merged the two branches and put the search-players-algorithm branch uptop

Upvotes: 0

Views: 28

Answers (2)

eftshift0
eftshift0

Reputation: 30317

I think you want to run git fetch so that you get the information from remote branches but without moving anything.

Upvotes: 0

Mureinik
Mureinik

Reputation: 312257

You can't have your cake and eat it. If you want to consume the latest changes from master, you'll have to rebase on top of it.

Upvotes: 2

Related Questions