Git merge: up to date?

Question

Git merge: up to date?

So, is there a git repository with branches(those branches) master and feature. the development was carried out in parallel.

Then easily made:

(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 changes enough

How do I "return" to the master?

Thank you

Git

Antonia_Pfeff asked October 3rd 19 at 02:45

More answers about "Git merge: up to date?"

2 answers

Bella.Witting answered on October 3rd 19 at 02:49

Changes from not pulling? with original?
git pull was?

all in one repository. why pull?

git merge in both directions shows a bunch of changes - Antonia_Pfeff commented on October 3rd 19 at 02:52

Somewhere you're obviously not telling me something, so I think the problem some sort of simple.
Well, what stopping you to do the round pool? - brock_Labadie commented on October 3rd 19 at 02:55

>>so I think the problem some sort of simple.
I agree. here only to find the problem.
>>Well, what's stopping you to make a round pool?
the lack of a remote repository?

PS with git experience not a lot - Antonia_Pfeff commented on October 3rd 19 at 02:58

brock_Labadie answered on · Accepted Answer · 2019-10-03T02:47:39.600Z

brock_Labadie answered on October 3rd 19 at 02:47

Solution

To return to master, use git checkout master.

If you mean that the feature branch has remained somewhere behind, and the master went forward, then merge from master will do nothing. You need to use Merge in the branch you want to move/change. That is, you need to switch to the feature and merge.

by "back" I mean that I want to change the feature to "inject" in the master - Antonia_Pfeff commented on October 3rd 19 at 02:50

I described how to do it. If I made it too complicated, do just. Switch and feature and merge with master and Vice versa — switch to master and merge feature. It sinhroniziruete branch. - brock_Labadie commented on October 3rd 19 at 02:53

please re-read the question. I'm stuck on:
"— switch to master and merge feature" - Antonia_Pfeff commented on October 3rd 19 at 02:56

The question is not correct :) re-Read my response to 11:14, if you need both sides to merge the two branches to refer to one commit, then there is told how to do it.

Either send a screenshot from the branches, perhaps I do not understand something. - brock_Labadie commented on October 3rd 19 at 02:59

if I understand you correctly, you want me to do so:
git checkout feature
git merge master
git checkout master
git merge feature
? - Antonia_Pfeff commented on October 3rd 19 at 03:02

It - brock_Labadie commented on October 3rd 19 at 03:05

well
git merge feature
and says:

$ git merge extended_search
warning: refname 'extended_search' is ambiguous.
Already up-to-date. - Antonia_Pfeff commented on October 3rd 19 at 03:08

In! This is something new :) Can you send the exhaust `git branch -a`? - brock_Labadie commented on October 3rd 19 at 03:11

$ git branch -a
dyn_sitemap
* extended_search
master - Antonia_Pfeff commented on October 3rd 19 at 03:14

This is exactly full exhaust or something you deleted?) Because this message usually occurs if you have a remote with the same name as the branch. Roughly speaking is not enough
remotes/extended_search/REFNAME - brock_Labadie commented on October 3rd 19 at 03:17

here's the full:
$ git branch -a
ABbilder
dyn_sitemap
* extended_search
fluthilfe
master - Antonia_Pfeff commented on October 3rd 19 at 03:20

OK, let's try to start from the other end, try to run in the root folder of the working copy

find .git -name extended_search

Should be something like

find .git -name master
.git/logs/refs/heads/master
.git/logs/refs/remotes/origin/master
.git/refs/heads/master
.git/refs/remotes/origin/master

And mihalop `git remote` just in case. - brock_Labadie commented on October 3rd 19 at 03:23

In principle, the problem can be solved by doing so

git branch-m extended_search ext_search
git checkout master
git merge ext_search

But I want to understand where the error grows to rename the branch. - brock_Labadie commented on October 3rd 19 at 03:26

$ find .git -name extended_search
.git/logs/refs/heads/extended_search
.git/refs/heads/extended_search
.git/refs/tags/extended_search - Antonia_Pfeff commented on October 3rd 19 at 03:29

.git/refs/tags/extended_search

The intersection of tag :) Either rename the tag or branch) Described above) - brock_Labadie commented on October 3rd 19 at 03:32

have something to add and try.
but damn, where's that tag?(rhetorical question:)) - Antonia_Pfeff commented on October 3rd 19 at 03:35

thank you so much!
everything works
now I'll know where to dig in the trail. times - Antonia_Pfeff commented on October 3rd 19 at 03:38