CODEWITHSUNDEEP
gitnetbeans-7bitbucket
ldrrp
ldrrp

Reputation: 704

Netbeans wont pull using bitbucket

I keep getting this every time, its been happening alot frequently. how do i fix this. every forum i find says to type in commands on git... were is this mystery console, i cant seem to find it or anything people are saying.

==[IDE]== May 19, 2013 5:24:00 PM Pulling...
git pull https://bitbucket.org/techreanimate/project
+refs/heads/master:refs/remotes/project/master
Branch  : project/master
Old Id : 6fdea249fc80641a1b3e63174e7dd4ec6b72d84d
New Id : a19141fea8cbc7a64553b84ed6b591e223384b7a
Result : FAST_FORWARD

Merge Result: Failed
Merge of HEAD with project/master failed because of these files:
A:\Dev\project\Workspace\project-Web\.htaccess

==[IDE]== May 19, 2013 5:24:03 PM Pulling... finished.

oh, its not always .htaccess, its random files

Upvotes: 2

Views: 1735

Answers (3)

VonC
VonC

Reputation: 1324208

Were is this mystery console

When plugin using git (like the IDE NetBeans) fails, it is best to fall back to that console.
Specifically, to a separate installation of git, to see if you reproduce the issue.

In windows, for instance, download and unzip an archive of msysgit portable.

Then try a git pull from your working tree, and see what the exact error message is.

Sych emphasizes in the comments (after Sych's own upvoted answer):

USE A DIFFERENT GIT CLIENT TO INITIALIZE THE REPO, then continue to use NetBeans

Also, make sure you can see and access your .gitignore and .htaccess (two dotfiles usually ignored by netbeans)

Netbeans preferences, go to the the Miscellaneous tab at the top, then click on the Files tab. You’ll see a “Files Ignored by the IDE” section there. 

^(CVS|SCCS|vssver.?\.scc|#.*#|%.*%|_svn)$|~$|^\.(?!(htaccess|gitignore)$).*$

That way, you can see how the git plugin treats those files.

Upvotes: 1

Sych
Sych

Reputation: 1823

I have ended up installing Tortoise GIT to initially fetch the repo to NetBeans project folder, after that I use NetBeans to sync files with the remote repo with no problem.

Upvotes: 2

sectus
sectus

Reputation: 15464

You have changed or created .htaccess file and didn't commit it.

If you are not ready to commit do git stash & git pull & git stash pop then resolve a conflict.

Or you can commit your changes then pull then reslove your conflict.

Upvotes: 0

Related Questions