Level 2
Incidentally just tried exactly the same on another project and that works perfectly so looks like something in Git doesn't like this particular project.
May 9, 2016
3
Level 2
Git issue - 'not something we can merge'
I'm having a weird problem with using Git on my PC and laptop and wondered if anyone had any ideas?
I've used Git (inside Vagrant) on the PC for months and never had any problems. I usually commit and push to Bitbucket using the following command:
git add -A && git commit && git push
Which works fine. I'd like to be able to work on the project on my laptop too so I cloned the project into Vagrant and it's all running OK there too. I can make changes on my PC and the push them to Bitbucket and then git pull them down to the laptop and that all works perfectly.
The problem come when I make changes on the laptop. I always run git pull before starting to edit the local copy is up to date and when I've made any changes it lets me push them back to Bitbucket perfectly OK. The issue then is if I go to the PC (where the project has not been touched) and do git pull from there I always get a merge message with a long ID string saying 'not something we can merge'.
I'm just not sure why it thinks it needs to merge as I am only making changes on one machine at a time and the push from the PC, the pull from the laptop and the editing and then pushing from the laptop all work fine - it just leaves me unable to pull again to the PC.
I've tried reset --hard and pull --all but still no luck - I can get the latest files onto the laptop but can't push them back without it breaking on the PC.
Level 2
In case anyone with a similar problem comes across this thread I eventually solved it by running git merge --abort on the PC.
Seems like there was some outstanding merge lurking around somewhere in the past though I don't recall ever doing a merge. Once I aborted the merge I can push and pull both ways between the laptop, Bitbucket and the PC.
Level 29
In case anyone with a similar problem comes across this thread I eventually solved it by running git merge --abort on the PC.
Glad to know, your resolved it. You can select your own answer as correct and mark the thread as answered (for other's benefit).
Please or to participate in this conversation.