[nbusers] Setting up git with Netbeans 7.2

  • From: "yamiko-org" < >
  • To:
  • Subject: [nbusers] Setting up git with Netbeans 7.2
  • Date: Thu, 11 Oct 2012 17:12:52 -0400

Im new to version control and fairly new to netbeans.

I created a repository on github and uploaded my project just fine on my 
laptop.

On my desktop I created a new project, fetched the repository and then merged 
from the remote branch. This got all the files. I worked on them, committed 
them and uploaded them with no problems.

Now I go back on my laptop and I try pulling and merging and do not get the 
updated files. I deleted the project and tried to do what I did on my desktop 
and again it wont get the files.

When I try to merge I get "you have local modification in working copy that 
would result in a checkout conflict. You may revert or review and commit the 
modified files from the versioning view"

I'm not sure what I did wrong. Is there a step by step tutorial on how to 
create a project, upload the changes and get them in another project etc.? 
the git guide on the site isn't helping me.






[nbusers] Setting up git with Netbeans 7.2

yamiko-org 10/11/2012

Project Features

About this Project

www was started in November 2009, is owned by jpirek, and has 21 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close