Skip to content
Snippets Groups Projects

WIP: Merge conflicts editor backend

Closed Sean McGivern requested to merge merge-conflicts-editor into master
All threads resolved!

What does this MR do?

Add a backend to support merge conflicts in an editor. https://gitlab.com/gitlab-org/gitlab-ce/issues/20344#note_14777035 and the commit message for https://gitlab.com/gitlab-org/gitlab-ce/commit/37d81c7fc38af2ac94bf0ae598311640ddc53593 attempt to describe this in words :wink:

Are there points in the code the reviewer needs to double check?

I haven't implemented this:

If you've already clicked to pick ours / theirs on the conflict sections, then edit the file, we resolve those conflicts before showing you the file.

I can do, I'm just wondering how the API should work. Do we always POST to conflict_for_path, and if the request has sections, resolve those first? We also might not want to do this: https://gitlab.com/gitlab-org/gitlab-ce/issues/20344#note_14786550

I'm also still working on adding JSON Schema (https://gitlab.com/gitlab-org/gitlab-ce/issues/20673) validations for these APIs. They should all use basically the same schema, which they didn't before, so that's progress!

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/21288

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
  • Sean McGivern
  • Sean McGivern
  • Sean McGivern
  • Sean McGivern
  • Sean McGivern Added 2 commits:

    Added 2 commits:

  • Sean McGivern Added 1 commit:

    Added 1 commit:

  • Sean McGivern Added 1 commit:

    Added 1 commit:

  • Author Contributor

    The failing specs are deliberate, because they are feature specs and we don't have a frontend for this yet.

  • Sean McGivern Added 1 commit:

    Added 1 commit:

  • Author Contributor

    The last commit adds a JSON schema, for what it's worth :slight_smile:

  • mentioned in issue #20344 (closed)

  • Author Contributor

    @dbalexandre would you take a look at this please?

  • Reassigned to @dbalexandre

  • Douglas Barbosa Alexandre
  • Douglas Barbosa Alexandre
  • Douglas Barbosa Alexandre
  • Douglas Barbosa Alexandre
  • @smcgivern Looks good :thumbsup:! Just few comments.

  • Sean McGivern Added 1 commit:

    Added 1 commit:

    • a60aa155 - Simplify conflict file JSON creation
  • Author Contributor

    @dbalexandre I've made a couple of changes, can you take a look at the other two?

  • Reassigned to @dbalexandre

  • @smcgivern Looks good :thumbsup: Just one comment.

  • Author Contributor

    @DouweM do you want to take a look too?

  • Reassigned to @DouweM

  • Rémy Coutable Added ~480950 ~13921 labels

    Added ~480950 ~13921 labels

  • Alfredo Sumaran Mentioned in merge request !6374 (merged)

    Mentioned in merge request !6374 (merged)

  • @DouweM Here's the MR with the frontend stuff for this MR. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6374. I'll finish a last one thing then add feature tests for that. Let me know if you want me to merge frontend stuff here.

  • Can someone take a look at this MR to fix the failing specs? @DouweM

  • Douwe Maan Resolved all discussions

    Resolved all discussions

  • Douwe Maan Added 906 commits:

    Added 906 commits:

  • Douwe Maan Added 1 commit:

    Added 1 commit:

    • 923cf9d1 - We now support resolving conflicts with ambiguous markers
  • Reassigned to @alfredo1

  • Author Contributor

    @alfredo1 can we close this in favour of !6374 (merged)?

  • @smcgivern Yes please.

  • Sean McGivern Status changed to closed

    Status changed to closed

  • Please register or sign in to reply
    Loading