Answer the question
In order to leave comments, you need to log in
Git merge: up to date?
So, there is a git repository with branches (those that are branches) master and feature. development was carried out in parallel.
Then without any problems I did:
(feature) git merge master
to check if everything works.
Now I'm trying to do:
(master) git merge feature
In response - Up to date
although there are enough changes
How do I "return" to master?
Thanks
Answer the question
In order to leave comments, you need to log in
To return to master, use git checkout master.
If you mean that the feature branch has remained somewhere behind, and master has gone forward, then merge from master will not work. Merge must be used on the branch you wish to migrate/change. That is, you need to switch to feature and execute merge.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question