Skip to content

Update gcode.asciidoc#188

Merged
ArcEye merged 1 commit intomasterfrom
strahlex-patch-1
Jul 13, 2016
Merged

Update gcode.asciidoc#188
ArcEye merged 1 commit intomasterfrom
strahlex-patch-1

Conversation

@machinekoder
Copy link
Copy Markdown
Member

Added links to example files

Added links to example files
@ArcEye
Copy link
Copy Markdown
Contributor

ArcEye commented Jul 13, 2016

09:31:25 + git subtree pull --prefix machinetalk-protobuf machinetalk-protobuf master --squash
09:31:27 From https://github.com/machinekit/machinetalk-protobuf
09:31:27  * branch            master     -> FETCH_HEAD
09:31:27 error: cannot run editor: No such file or directory
09:31:27 error: unable to start editor 'editor'
09:31:27 Not committing merge; use 'git commit' to complete the merge.
09:31:27 Build step 'Conditional step (single)' marked build as failure

I am not sure what this actually means, probably need @mhaberler to look at it.
Could be connected to recent changes or could just be a coincidental glitch.

This commit should be fine, but better get the issue fixed first, or nothing will be transferred to the docs site anyway

@ArcEye
Copy link
Copy Markdown
Contributor

ArcEye commented Jul 13, 2016

09:31:27 error: cannot run editor: No such file or directory
09:31:27 error: unable to start editor 'editor'

On reflection, I think this is git trying to open the default editor, as it does when you do a merge manually, giving you the opportunity to add comments to the stock message.

There should be some way to script it so that just commits without that step.
Will have to look at it later if @mhaberler does not beat me to it.

@mhaberler
Copy link
Copy Markdown
Contributor

@ArcEye
Copy link
Copy Markdown
Contributor

ArcEye commented Jul 13, 2016

this seems to have done the trick:

That makes sense, set -m "message" and it won't ask you for one.

I'll merge this anyway, it does not actually affect what was failing and the last build your change prompted passed.

@ArcEye ArcEye merged commit 5856161 into master Jul 13, 2016
@mhaberler
Copy link
Copy Markdown
Contributor

well protobuf.asciidoc is not updated in both -preview and -production. Sigh..

@mhaberler mhaberler deleted the strahlex-patch-1 branch July 13, 2016 10:12
@mhaberler
Copy link
Copy Markdown
Contributor

@ArcEye
Copy link
Copy Markdown
Contributor

ArcEye commented Jul 13, 2016

This commit is certainly in preview and the main site now

The links in http://www.machinekit.io/docs/examples/gcode/ now point to the MK repo
whereas previously they were a relative link to the same dir

@machinekoder
Copy link
Copy Markdown
Member Author

@mhaberler yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants