search

MoeOrganization / moe

An -OFun prototype of an Ultra Modern Perl 5
http://moe.iinteractive.com
MIT License
278 stars 46 forks source link

Perl5 string transliteration (method and operator) #126

Closed prakashk closed 11 years ago

prakashk commented 11 years ago

Second attempt

stevan commented 11 years ago

Looks like you have duplicate commits? Or am I missing something

prakashk commented 11 years ago

The second one is a merge commit. When I first my trans-op branch, I didn't realize that it was not up-to-date wrt master. So, I created a new branch (trans-op-2) off of master and merged with the trans-op commit and pushed it again. I probably should have rebased instead of merge.

One of these I will get the hang of this git thing.

stevan commented 11 years ago

Prakash,

Ah okay, I will merge it later tonight.

Thank,

Stevan

On Jun 14, 2013, at 7:18 PM, Prakash Kailasa notifications@github.com wrote:

The second one is a merge commit. When I first my trans-op branch, I didn't realize that it was not up-to-date wrt master. So, I created a new branch (trans-op-2) off of master and merged with the trans-op commit and pushed it again. I probably should have rebased instead of merge.

One of these I will get the hang of this git thing.

— Reply to this email directly or view it on GitHub.