search

tuura / plato

A DSL for asynchronous circuits specification
Other
12 stars 2 forks source link

initialise function created to make initialising signals in concepts more simple #1

Closed jrbeaumont closed 8 years ago

snowleopard commented 8 years ago

@jrbeaumont Thanks! Could you please resolve merge conflicts? I can't merge right now. I guess you are missing some changes compared to my branch: I can see some operators are called differently: (~&~>) vs (~&&~>).

Once the merge conflicts are removed I'll do the merge.

jrbeaumont commented 8 years ago

Hi Andrey, I cannot view the conflicts, it says I need write access. I have tried comparing the code to your master branch but I see only the changes I've made to Circuit/Concept.hs. Sorry, I am a GitHub noob, I've never done this much with it haha

snowleopard commented 8 years ago

@jrbeaumont Don't worry, we'll figure it out :) Maybe you can start by reading some guides, e.g.: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request.

One easy way to solve this issue is to fork my project again, redo changes in it, and propose a pull request again. In this way we'll guarantee there are no conflicting changes on my side.