5 ms·

congrats for the new release, here my critic (don't take me wrong, I use and love gitlab for so long, and the other features of 8.11 are really awesome) * merg

by allan_s 10y ago

congrats for the new release, here my critic (don't take me wrong, I use and love gitlab for so long, and the other features of 8.11 are really awesome) * merge conflict resolution: It definitely looks cool and make conflict resolution BY MERGING easier than any other way i know BUT most of the time I want my co-worker to resolve conflict BY REBASING (i.e as if they had branched just right now) , following the principle that you merge from specific to generic. So though I definitely agree most of people don't care, but for larger team/project where you often need to make archeology and dig inside the commit history , the "master merged into feature branch" makes the commits tree look weird Outside of this, it's maybe only me, but most of the team I've worker with where using a scrum-like taskboard (like http://taiga.io http://taiga.io ) instead of a kanban-like, is it planned to be added/provide the option or (which I perfectly understand) do you plan on focusing on kanban and letting third-party project for those who prefer scrum ?

K0nserv 10y ago
GitLab EE has an option to require MRs to be fully rebased before allowing merges.
sytse 10y ago
Hugo already mentioned the rebasing option in https://news.ycombinator.com/item?id=12339492 https://news.ycombinator.com/item?id=12339492 As for the Kanban board, as far as I can read in https://www.cprime.com/2015/02/3-differences-between-scrum-and-kanban-you-need-to-know/ https://www.cprime.com/2015/02/3-differences-between-scrum-a... the only difference with a scrum board is that you can set a maximum number per list. Feel free to create a feature proposal for that, I've already heard that request before today.
- allan_s 10y ago
  hmm yes you're right, I was mislead by the name of each list on the blog post, it's true that nothing prevent me from naming each column "new" , "in progress" , "ready for qa", and "done" , my bad. this + burn down charts (like proposed in https://gitlab.com/gitlab-org/gitlab-ee/issues/91 https://gitlab.com/gitlab-org/gitlab-ee/issues/91 ) would really start for us to make gitlab embrassing the full life-cycle of our products. As for resolving conflict by merging, thanks I didn't know EEhad this feature.
  - sytse 10y ago
    Cool, thanks for asking and glad to learn we're on the right path.

by allan_s 10y ago

K0nserv 10y ago

GitLab EE has an option to require MRs to be fully rebased before allowing merges.

sytse 10y ago

Hugo already mentioned the rebasing option in https://news.ycombinator.com/item?id=12339492 https://news.ycombinator.com/item?id=12339492 As for the Kanban board, as far as I can read in https://www.cprime.com/2015/02/3-differences-between-scrum-and-kanban-you-need-to-know/ https://www.cprime.com/2015/02/3-differences-between-scrum-a... the only difference with a scrum board is that you can set a maximum number per list. Feel free to create a feature proposal for that, I've already heard that request before today.

allan_s 10y ago
hmm yes you're right, I was mislead by the name of each list on the blog post, it's true that nothing prevent me from naming each column "new" , "in progress" , "ready for qa", and "done" , my bad. this + burn down charts (like proposed in https://gitlab.com/gitlab-org/gitlab-ee/issues/91 https://gitlab.com/gitlab-org/gitlab-ee/issues/91 ) would really start for us to make gitlab embrassing the full life-cycle of our products. As for resolving conflict by merging, thanks I didn't know EEhad this feature.
- sytse 10y ago
  Cool, thanks for asking and glad to learn we're on the right path.