Skip to content

Conversation

@ddemidov
Copy link
Member

See ev3dev/ev3dev-lang#142

This creates a submodule pointing to decentralized branch of ev3dev/ev3dev-lang, and adds the required autogen-config.json file. When this is merged, autogen may be executed as ./ev3dev/exec-autogen.js.

Also, I am not sure which branch to create pull requests against now. It looks like develop suffered from recent merge disasters. Should it be just hard reset to master?

@rhempel
Copy link
Member

rhempel commented Dec 30, 2015

Thanks for doing this - I was ready to start work on this for my New Years first project. yes master is where I am currently doing merges, but I think I may want instead to start using a more GitHub friendly workflow that uses master for actual tagged releases, develop for current merging until the next release, and then small feature branches.
Leave the PR against master for now - I'll reset develop hard to master this evening. There's nothing in develop that is historically significant except as a lesson in git antipatterns.

rhempel added a commit that referenced this pull request Jan 1, 2016
Switch to decentralized model
@rhempel rhempel merged commit d111e5a into ev3dev:master Jan 1, 2016
@rhempel
Copy link
Member

rhempel commented Jan 1, 2016

Thanks!

@rhempel
Copy link
Member

rhempel commented Jan 1, 2016

So after merging this commit, the script is actually at ./ev3dev-lang/exec-autogen.js - not a big deal.

@ddemidov
Copy link
Member Author

ddemidov commented Jan 1, 2016

Yes, sorry about the misleading typo :)

@ddemidov ddemidov deleted the decentralize branch January 1, 2016 17:31
@rhempel
Copy link
Member

rhempel commented Jan 1, 2016

So far my New Year's resolution has held up - I have not completely clobbered my repo or the history.

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.

2 participants