Git Merging not showing server side code

Question

I am on android studio.

I have 2 branches: one is the animation branch and the second is develop branch. Develop branch created from the origin, and the animation branch from another branch.

I want to merge these two branches but the issue is that whenever I hit merge on android studio with the conflicted files, the server side code is just an empty fully.
I never run into such issue and I have restarted the android studio, cleared caches but nothing helping.

Can someone please explain me what is going on? Important to mention that whenever I pull the develop or animation view the code is OK.

Can you try from the command line? `git checkout oneBranch; git merge theOtherBranch`. — VonC, Jul 04 '16 at 07:26
Removing app/src/main/res/values-v19/styles.xml CONFLICT (modify/delete): app/src/main/java/volo/global/pingbing/StartupActivity.java deleted in origin/develop and modified in HEAD. Version HEAD of app/src/main/java/volo/global/pingbing/StartupActivity.java left in tree. Automatic merge failed; fix conflicts and then commit the result. — VA Entertaiment, Jul 04 '16 at 07:32

score 1 · Accepted Answer · edited May 23 '17 at 11:44

1

Removing app/src/main/res/values-v19/styles.xml CONFLICT (modify/delete): 
app/src/main/java/volo/global/pingbing/StartupActivity.java 
deleted in origin/develop and modified in HEAD. 
Version HEAD of app/src/main/java/volo/global/pingbing/StartupActivity.java left in tree. 
Automatic merge failed; fix conflicts and then commit the result.

As mentioned in "How do I fix a merge conflict due to removal of a file in a branch?", you need to accept what is in the tree:

git add .
git commit -m "Accept changes from HEAD"

edited May 23 '17 at 11:44

Community

1
1

answered Jul 04 '16 at 08:11

VonC

1,262,500
529
4,410
5,250

the issue is that the origin/develop showing empty fully....no code...but actually there is heap of code written.... – VA Entertaiment Jul 04 '16 at 08:14
@VAEntertaiment Yes, but the error message explains how to get back that code: simple git add, then commit (which will finalize the merge) then push. – VonC Jul 04 '16 at 08:15
hmmm isn't it risky?what if it will merge with empty code if it shows the empty code from server side? – VA Entertaiment Jul 04 '16 at 08:16
@VAEntertaiment You can review the result before commit and push, so try it and see if the result in your local tree is what you want. – VonC Jul 04 '16 at 08:16
@VAEntertaiment Have yo tried to run git mergetool and just keep the file that is not empty? – Alejandro Alcalde Jul 04 '16 at 08:17
ahh ok got it and there is always chance to revert back the local changes if it won`t fit my needs right? – VA Entertaiment Jul 04 '16 at 08:17
@VAEntertaiment Exactly: those changes remains local until you push. – VonC Jul 04 '16 at 08:17
perfect and what about the git merge tool?did not hear about it – VA Entertaiment Jul 04 '16 at 08:18
@VAEntertaiment, When you have conflicts, as in your case, it is a tool that shows you a base file, your changed file and the remote file. And then you edit the file in order to “merge” the conflict – Alejandro Alcalde Jul 04 '16 at 08:19
1

@VAEntertaiment https://git-scm.com/docs/git-mergetool for instance https://www.toofishes.net/blog/three-way-merging-git-using-vim/ – VonC Jul 04 '16 at 08:19
got that will try all this and let you know what happened :) – VA Entertaiment Jul 04 '16 at 08:19

Git Merging not showing server side code

1 Answers1