1

I have a remote server on which I run a number of scripts. I just run my scripts on that server, and do my editing and saving and pushing to bitbucket cloud as my origin repository from other locations.

How do I automate the "git pull origin" command for that windows server. This isnt about running a command or script in the Task Scheduler, but more like I have to manually comment everytime when I do a "git pull origin".

I just wish to run "git pull origin" to make sure my scripts are up to date on the server in the morning before running.

But I am having trouble doing it without being forced to manually enter a message or other manual behavior.

Maybe do I have a setting wrong?

AdilZ
  • 1,107
  • 6
  • 27
  • 44
  • What do you mean by 'I have to manually comment everytime when I do a "git pull origin"'? It sounds like you might have local changes on your server and you're being asked to deal with a conflict. – ChrisGPT was on strike Dec 04 '17 at 23:17
  • Oh that makes sense, there might be a corruption, I think for this you use git pull origin --rebase right? – AdilZ Dec 04 '17 at 23:20
  • It depends entirely on (a) what you want to do and (b) what you have. You have't provided enough information to know the right answer. Please read [ask]. – ChrisGPT was on strike Dec 05 '17 at 00:31

1 Answers1

1

I think for this you use git pull origin --rebase right

No: weather you are doing a merge (pull) or a rebase (pull --rebase), any concurrent modification on the same set of files would potentially involve conflicts, to be resolved manually.

If you see the same conflict over and over again, do consider git rerere, that I detail here.

That, or maintain a separate clone of the repo, in which you make no modification, and can do a git pull without ever having to enter any comment.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250