Git updates

[Christian Iversen]

Hello World

So, I did some git commands without quuuuite thinking them through, but
thanks to awesome help from Samuel [Neppord], I'm back on track.

This means that I deleted my "ist/compiler" branch on github, and
re-pushed it. If any of you have cloned it and worked on it, you should
rebase against the new ist/compiler. If you're unsure of how to do that,
or don't know what it means, please contact me. I'll help you :)

Also, I was able to merge some local branches, which means that the old
"devel" branch (which I've removed from GitHub for now) now shares the
first part of its history with ist/compiler. The history is so much more
clean now.

Gordon, this also means that I have a much clearer idea of the work
you've put into pyjaco. The last commit before it diverges into
modules-implementation and ist-compiler is 65514ceb.

So, just a heads-up. If you work on ist/compiler, please rebase or clone
a fresh repos :)

--
Med venlig hilsen
Christian Iversen

[Samuel Ytterbrink]

1+

--
--
You are subscribed to the Google Group pyj...@googlegroups.com
To unsubscribe from this group, send email to
pyjaco+un...@googlegroups.com

--- You received this message because you are subscribed to the Google Groups "pyjaco - The Python to Javascript compiler" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pyjaco+un...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

--
//Samuel Ytterbrink

[g]

So, I did some git commands without quuuuite thinking them through, but
thanks to awesome help from Samuel [Neppord], I'm back on track.

I've done that before.  Makes you worry a heart attack is coming hah.

 

This means that I deleted my "ist/compiler" branch on github, and
re-pushed it. If any of you have cloned it and worked on it, you should
rebase against the new ist/compiler. If you're unsure of how to do that,
or don't know what it means, please contact me. I'll help you :)

Also, I was able to merge some local branches, which means that the old
"devel" branch (which I've removed from GitHub for now) now shares the
first part of its history with ist/compiler. The history is so much more
clean now.

Nice

 

Gordon, this also means that I have a much clearer idea of the work
you've put into pyjaco. The last commit before it diverges into
modules-implementation and ist-compiler is 65514ceb.

I haven't been able break free for any substantial amount of time to make headway on this yet.  Not intentionally dragging my feet =/.

[Samuel Ytterbrink]

Den lördagen den 17:e augusti 2013 skrev g:

So, I did some git commands without quuuuite thinking them through, but
thanks to awesome help from Samuel [Neppord], I'm back on track.

I've done that before.  Makes you worry a heart attack is coming hah.

The reflog has you covered!

 

This means that I deleted my "ist/compiler" branch on github, and
re-pushed it. If any of you have cloned it and worked on it, you should
rebase against the new ist/compiler. If you're unsure of how to do that,
or don't know what it means, please contact me. I'll help you :)

Also, I was able to merge some local branches, which means that the old
"devel" branch (which I've removed from GitHub for now) now shares the
first part of its history with ist/compiler. The history is so much more
clean now.

Nice

 

Gordon, this also means that I have a much clearer idea of the work
you've put into pyjaco. The last commit before it diverges into
modules-implementation and ist-compiler is 65514ceb.

I haven't been able break free for any substantial amount of time to make headway on this yet.  Not intentionally dragging my feet =/.

--

--
You are subscribed to the Google Group pyj...@googlegroups.com
To unsubscribe from this group, send email to
pyjaco+un...@googlegroups.com
 
---
You received this message because you are subscribed to the Google Groups "pyjaco - The Python to Javascript compiler" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pyjaco+un...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

--
//Samuel Ytterbrink

[Christian Iversen]

On 2013-08-17 16:25, g wrote:
>
> So, I did some git commands without quuuuite thinking them through, but
> thanks to awesome help from Samuel [Neppord], I'm back on track.
>
> I've done that before. Makes you worry a heart attack is coming hah.

I know! I was lucky the github branch was so new, so I could just delete
it and re-push.

> Gordon, this also means that I have a much clearer idea of the work
> you've put into pyjaco. The last commit before it diverges into
> modules-implementation and ist-compiler is 65514ceb.
>
> I haven't been able break free for any substantial amount of time to
> make headway on this yet. Not intentionally dragging my feet =/.

Don't worry, I know what it's like :)

I've been looking through your commits, and there's a lot of good work
in there. Unfortunately, it's all very specific to the old compiler, but
I think the principles can easily be implemented on IST. Some of the
things are even bound to get a bit easier.