[SCALA-API] Scala API branch pushed to gitbox repo

[Benedikt Ritter <br...@apache.org>]

Hi all,

I’ve just pushed the work I’ve started a few weeks ago on the Scala API to the gitbox repo. The branch is called PLC4X-12 (the name of the lira issue). The branch is currently outdated, because we introduced some changes to the Java API after started my work. I never got around to bringing the branch up to date with current master. But maybe somebody wants to continue working on the Scala API, so there it is :o)
I don’t think we have agreed on how to work with git yet. Do we want to rebase the branch thereby potentially breaking peoples working copies or do we simply merge master to the PLC4X-12 branch?

Cheers,
Benedikt

Re: [SCALA-API] Scala API branch pushed to gitbox repo

[Justin Mclean <ju...@me.com>]

Hi,

> I don’t think we have agreed on how to work with git yet. Do we want to rebase the branch thereby potentially breaking peoples working copies or do we simply merge master to the PLC4X-12 branch?

Some projects do use rebase but there are some concerns raised at the ASF that history can be modified this way. People new to git are less likely to make errors with merging IMO so I fine for just using merge.

Some projects use a develop and master branch.  I seen this also cause a little confusion for new users (and sometimes experienced ones) so I’m all for working off a single master branch and using feature branches and branches for bug fixes.

What do other people think?

Thanks,
Justin