J
J
joger2013-06-20 17:52:59
git
joger, 2013-06-20 17:52:59

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

2 answer(s)
A
AgentSIB, 2013-06-21
@joger

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.

P
Puma Thailand, 2013-06-20
@opium

Where does change come from? with original?
was there a git pull?

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question