search

alpaka-group / cupla

C++ User interface for the Platform independent Library Alpaka :arrows_clockwise:
Other
37 stars 18 forks source link

Updates alpaka to 0.3.5. #81

Closed tdd11235813 closed 5 years ago

tdd11235813 commented 5 years ago

Closes #80.

ax3l commented 5 years ago

uh dang, now I merged to master!

ax3l commented 5 years ago

I just fast-forwarded the same change to dev and removed the merge commit from master.

tdd11235813 commented 5 years ago

Thanks, but I thought master is ok in this case, because the master is now dysfunctional again. So when it will be on the master? I use master+tag on my submodules. Why not committing onto master all the time and using (release) tags? Why there is a separate dev branch at all? Wouldn't be trunk based development with only one long-lived branch more convenient? Maybe I already have asked this in the past w.r.t. alpaka, not sure at the moment, so we also can discuss it next week ;)

ax3l commented 5 years ago

Yep, we can do this. Just currently, most of our projects follow a successful git branching model since we did initially (and still do) let our users interact with git source code directly and wanted to avoid giving them an "unstable" trunk/dev by default.

Nevertheless, I think with package managers and the overhead of dev/master we can certainly think about migrating to trunk-based devel as most projects nowadays do. But that needs some coordination, let's discuss next week :)

I use master+tag on my submodules.

I think you know how to set dev there then as well ;-) It's really the same, we just have an additional facade branch that only contains the merge commits for releases.