Skip to content
Snippets Groups Projects

Stable/ws2p v1.1 trymerge

Merged Stable/ws2p v1.1 trymerge
stable/ws2p-v1.1-trymerge into 1.6
Merged Éloïs requested to merge stable/ws2p-v1.1-trymerge into 1.6

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Éloïs mentioned in merge request !1208 (closed)

    mentioned in merge request !1208 (closed)

  • Éloïs
    Éloïs @librelois ·
    Author Owner

    @nodes/typescript la branche 1.6 a beaucoup beaucoup changée et le travail de résolution des conflits était gros et délicat (en particulier parce que cgeek a retravailler récemment sur 1.6 un code qui se comporte totalement différemment en ws2p 1.1) que j'ai préféré le faire sur une nouvelle branche.

    la branche stable/ws2p⁻v1.1-trymerge est donc équivalente a la branche stable/ws2p-v1.1, avec la résolution des conflits en plus :)

    Pour que l'on puisse avancer j'aimerais si possible qu'aucun nouveau commit ne soit poussé sur la branche 1.6 tant que cette MR n'aura pas été mergée car a chaque nouvelle modification je doit à nouveau résoudre les conflits et vous à nouveau revérifier ce qui fait plus de boulot pour tout le monde :p

    @nodes/typescript branch 1.6 has changed a lot and the conflict resolution work was big and tricky (especially because cgeek has recently reworked a code on 1.6 that behaves totally differently in ws2p 1.1) than I preferred to do on a new branch.

    the stable/ws2p-v1.1-trymerge branch is therefore equivalent to the stable/ws2p-v1.1 branch, with conflict resolution in addition :)

    So that we can progress I would like if possible that no new commit be pushed on the branch 1.6 until this MR will not have been merged because with each new modification I have to solve the conflicts again and you check again what makes more work for everyone :p

    Edited by Éloïs
  • Éloïs added 1 commit

    added 1 commit

    • d7fed2fd - Revert "Merge branch 'better_cpu_adjustement' into '1.6'"

    Compare with previous version

  • Éloïs
    Éloïs @librelois ·
    Author Owner

    Please dont' merge for the moment, there is a critical bug #1234 (closed) to solve before (this is not coming from my code, it's a consequence of merging with recent developments on 1.6...)

  • Éloïs added 3 commits

    added 3 commits

    Compare with previous version

  • Éloïs added 1 commit

    added 1 commit

    Compare with previous version

  • Éloïs
    Éloïs @librelois ·
    Author Owner

    That's it this time everything is good, I will merge this MR tomorrow night (Monday 11) cc @c-geek @Insoleet @moul

    Edited by Éloïs
  • Éloïs added 1 commit

    added 1 commit

    • bbf2b959 - [fix] finalize the revert of the branch' better_cpu'

    Compare with previous version

  • Éloïs merged

    merged

  • Éloïs mentioned in commit 70a1073f

    mentioned in commit 70a1073f

Please register or sign in to reply