Re: [myhdl-list] Keep hierarchy in VHDL conversion

[Christopher F. <chr...@gm...>]

>> I have found some short coming with git and my work flow but I assume
>> that was me being less familiar with git than hg.
>
> I'm curious to know about your experience. Care to share?

I don't mind sharing but I do think I will embarrass
myself :)  I am sure, to a experienced git'er it is
basic or they would be appalled at my work flow.

I had created a MyHDL version for the fpgalink project[1]
but the module was embedded in another project I had on
bitbucket.  Since, fpgalink was on github I decided to
try and get a little more experience with git.  So I
created a project on github, cloned it to my pc and started
adding the files, commits, making modifications, etc.  Then
I had to travel or something and made a clone from my pc
to a laptop.  Made some changes, commits etc.

Now when I tried to push back to the pc it didn't work.
It said I could not push to a repo with modifications?  I
was confused.  I was unable to resolve the issue, I had to
do merge things manually.

I think the solution I would have been told would be to
push to github and then sync the pc with github.  But this
is not what I wanted to achieve.

Regards,
Chris

[1] https://groups.google.com/forum/#!topic/fpgalink-users/Oxh2Hu08J8A

Note the above post is outdated, I moved the code from the
original repo in the post to a github repo (or I tried,
still haven't gotten it pushed back).