script name can be followed by optional arguments

[polakovic]

Script definition now can contain also optional arguments (e.g. for using single script for multiple operation).

[polakovic]

Hm, what are the conflicts? I don't see any other pending pull request for these two files...

[sholmbo]

Your branch is behind indilib:master which has changes to telescope_script.cpp that are not in yours. So you have to merge indilib:master with yours first.

[polakovic]

Sorry, but how can I do it?

[knro]

Just do a git pull, and git merge master.

[polakovic]

I tried already, it doesn't do anything:

retina:indi polakovic$ git pull
Already up-to-date.
retina:indi polakovic$ git merge master
Already up-to-date.
retina:indi polakovic$

[sholmbo]

You have to merge the indilib:master as it is the one that should pull. If you haven't added it as a remote, try something like

$ git remote add indilib git@github.com:indilib/indi.git
$ git pull indilib master

Then you'll get the merge conflict I think.

[polakovic]

fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.

Both for git@github.com and polakovic@github.com...