Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Using git pull
#14
You can't add the files because they are already in the project, that is why you get a conflict when you try to pull, you have to delete untracked files that are already in the base project. You can use "git reset" if you haven't committed the changes.

As to the recommended permissions the thing is that git versions the state, whether I want to or not, git is going to register and control that information, so the recommended status is the one in the repository (in most of the files). If you need something different for your specific install then you simply execute the "ignore" command on your system. I really have no choice.
Joe
TSolucio
Reply


Messages In This Thread
Using git pull - by mweaver - 05-08-2015, 04:15 PM
RE: Using git pull - by joebordes - 05-08-2015, 05:04 PM
RE: Using git pull - by mweaver - 05-08-2015, 05:41 PM
RE: Using git pull - by joebordes - 05-08-2015, 06:19 PM
RE: Using git pull - by mweaver - 05-08-2015, 07:26 PM
RE: Using git pull - by mweaver - 05-08-2015, 07:56 PM
RE: Using git pull - by joebordes - 05-08-2015, 09:46 PM
RE: Using git pull - by mweaver - 05-08-2015, 09:50 PM
RE: Using git pull - by joebordes - 05-11-2015, 01:57 PM
RE: Using git pull - by mweaver - 05-11-2015, 05:34 PM
RE: Using git pull - by joebordes - 05-11-2015, 11:20 PM
RE: Using git pull - by polanskiman - 05-12-2015, 05:40 AM
RE: Using git pull - by polanskiman - 05-12-2015, 06:40 AM
RE: Using git pull - by joebordes - 05-12-2015, 10:37 PM
RE: Using git pull - by polanskiman - 05-13-2015, 03:47 AM
RE: Using git pull - by polanskiman - 05-14-2015, 04:44 AM
RE: Using git pull - by joebordes - 05-14-2015, 06:14 AM

Forum Jump:


Users browsing this thread: 1 Guest(s)