problems with pulling or pushing the code

Question

My question is very basic but still it is unclear for me. I am working on a rails project with multiple developers. All of them can pull or push the project. So let me explain my scenario. If I am making changes in my code for the first time and the other developers are also making changes, when I try to push the project I am able to do so. But the other developer face problem in pulling the project. After that If they are able to make changes and pull the project then I am unable to push the project or pull the project. This is how we push the project first:

git add .
git commit .
git pull origin master

but the error comes warning: Cannot merge binary files or I get the error git pull fails with “Untracked working tree file 'blah' would be overwritten by merge

Please review a Git tutorial, your setup is in a mess. You probably don't want to be committing binary files. — Tim Biegeleisen, Apr 01 '16 at 04:55
i have actually seen the tutorial but was quite unclear that is why i posted my errors over her — Aniket Tiwari, Apr 01 '16 at 04:57
`git pull` merges remote with local. If you want to replace your local master with the remote master, use `git fetch` and then `git reset --hard origin/master`. Your local master will be lost. — Petr Gazarov, Apr 01 '16 at 05:02

Yogesh Jangra · Accepted Answer · 2016-04-13T03:52:31.743

The problem is coming because you and your friend doing changes on the same line of the file and git is unable to decide which one to take. So in this case its better to go for stash first to save your code. The code will be:-

git stash   :-  To save your code 

git pull    :-  To pull the code from git

git stash apply  :-  To merge your changes with the pulled files, if any merging error is coming then it will hit an error saying merge-conflict,you have to resolve that manually.

git add  :- To add the files

git commit -m "Commit message"  :- To commit it

git push  :-  To push to the repo.

I think this will solve your problem

score 0 · Answer 2 · edited May 23 '17 at 11:52

git checkout accepts --ours or --theirs options for cases like this. So if you have a merge conflict, and you know you just want the file from the branch you are merging in, you can do:

$ git checkout --theirs -- path/to/conflicted-file.txt

to use that version of the file. Likewise, if you know you want your version (not the one being merged in) you can use

$ git checkout --ours -- path/to/conflicted-file.txt

ref:Resolving a Git conflict with binary files

In your case the file is 'blah' in the working directory of remote location. so u can keep one of them.

problems with pulling or pushing the code

2 Answers2