S
S
serp in2015-08-07 11:13:33
git
serp in, 2015-08-07 11:13:33

Missing files after merging GIT branches?

There is a remote repository and a dev branch, in which someone changed file1 and added file2, file3.
Actions: pull remote_reponext merge remote_repo/dev
There are some conflicts, but most importantly, when merging, file3 did not get into the local branch, although it diff remote_repo/devshows that the file is present.
But if checkout -b test remote_repo/devthen file3 is present in the test branch.
Actually the question is: how to make file3 appear in the local dev branch?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
serp in, 2015-08-07
@abacabb

The wrong remote repository was being tracked...

V
Victor, 2015-08-07
@v_decadence

Note: merge remote_repo/dev is not needed after pull remote_repo dev, since it is already done in pull.
My guess is that file3 was also created and then deleted in the local branch prior to the merge or conflict resolution.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question