Fixing netbeans in ubuntu

Netbeans has some issues in Ubuntu 10.10 and 11.04.  One of the most serious is that javascript syntax highlighting does not work.  Another is that Rails 3 applications do not run or debug correctly.  I found the solution to be going to “Tools – Plugins -Settings” and enabling the “Netbeans” update center.  Then by going …

Continue reading ‘Fixing netbeans in ubuntu’ »

Git: Untracked working tree file would be overwritten by merge

I ran into a merge conflict when a branch had changed a file and I was merging in another branch where the file had been deleted and placed in gitignore.   Some suggestions on handling this here: fetch – Force git to overwrite local files on pull. – Stack Overflow I used: git checkout <your-branch> -f I …

Continue reading ‘Git: Untracked working tree file would be overwritten by merge’ »