<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=324765) </details> <!--IssueSummary end--> <!-- The first section "Release notes" is required if you want to have your release post blog MR auto generated. Currently in BETA, details on the **release post item generator** can be found in the handbook: https://about.gitlab.com/handbook/marketing/blog/release-posts/#release-post-item-generator and this video: https://www.youtube.com/watch?v=rfn9ebgTwKg. The next four sections: "Problem to solve", "Intended users", "User experience goal", and "Proposal", are strongly recommended in your first draft, while the rest of the sections can be filled out during the problem validation or breakdown phase. However, keep in mind that providing complete and relevant information early helps our product team validate the problem and start working on a solution. --> ### Release notes When adding changes through the web IDE or by accepting suggested changes, the user can choose to amend an existing commit in the MR instead of creating a new one. ### Problem to solve As a developer I want to be able to amend existing commits in the web IDE, in order to keep my commits atomic. ### Intended users Developers ### User experience goal Many developers work with [atomic commits](https://www.pauline-vos.nl/atomic-commits/), which is to say they keep changes related to each other in the same, small commit (as opposed to checkpoint commits, creating new commits any time they've changed code). For more information as to why people keep their commits atomic as a best practice, please see the linked blog post. Currently, when a suggested change is accepted or when a change is made in the web IDE, it's only possible to create a new commit with these changes. However, it's likely that a developer working with atomic commits will want to amend the appropriate commits in the MR instead. For that reason there's not much use for the suggested changes/web IDE features for developers using atomic commits. ### Proposal - A user accepts suggested changes, or decides to commit changes they made in the web IDE - They're offered a list of commits in their MR - User chooses one of these commits - The changes are added to that commit, as opposed to a new commit being created. ### Further details This would be a typical workflow for someone working with atomic commits: - Dev 1 starts fixing a bug, - Fixes the bug and writes a test, - Creates a commit "fix bug X", - Sees a bloated method and extracts it - Creates a separate commit "extract bloated method", - Creates MR. - Dev 2 notices a missing test case, requests changes - Dev 1 adds the test case, - Adds it to the commit "fix bug X", instead of creating a new commit. This results in only 2 commits, with appropriate commit message and all the changes appropriately committed together. Were Dev 2 to write the missing test case in a `suggested changes` comment, there is no way for Dev 1 to add those changes to the appropriate commit. Dev 1 would then have to: - Accept the changes - Fetch and pull the commit - Interactively rebase - Squash the new commit into the old one - Force push. Allowing for the changes to be accepted directly into an existing commit would make it a more useful feature. ### Permissions and Security Permissions would mirror current permissions of the web IDE / accept suggested changes features. ### Documentation <!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/workflow.html#for-a-product-change * Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/workflow.html * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html --> ### Availability & Testing <!-- This section needs to be retained and filled in during the workflow planning breakdown phase of this feature proposal, if not earlier. What risks does this change pose to our availability? How might it affect the quality of the product? What additional test coverage or changes to tests will be needed? Will it require cross-browser testing? Please list the test areas (unit, integration and end-to-end) that needs to be added or updated to ensure that this feature will work as intended. Please use the list below as guidance. * Unit test changes * Integration test changes * End-to-end test change See the test engineering planning process and reach out to your counterpart Software Engineer in Test for assistance: https://about.gitlab.com/handbook/engineering/quality/test-engineering/#test-planning --> ### Available Tier <!-- This section should be used for setting the appropriate tier that this feature will belong to. Pricing can be found here: https://about.gitlab.com/pricing/ * Free * Premium/Silver * Ultimate/Gold --> ### What does success look like, and how can we measure that? <!-- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this. Create tracking issue using the the Snowplow event tracking template. See https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Snowplow%20event%20tracking.md --> ### What is the type of buyer? <!-- What is the buyer persona for this feature? See https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/buyer-persona/ In which enterprise tier should this feature go? See https://about.gitlab.com/handbook/product/pricing/#three-tiers --> ### Is this a cross-stage feature? <!-- Communicate if this change will affect multiple Stage Groups or product areas. We recommend always start with the assumption that a feature request will have an impact into another Group. Loop in the most relevant PM and Product Designer from that Group to provide strategic support to help align the Group's broader plan and vision, as well as to avoid UX and technical debt. https://about.gitlab.com/handbook/product/#cross-stage-features --> ### Links / references <!-- Label reminders - you should have one of each of the following labels. Use the following resources to find the appropriate labels: - https://gitlab.com/gitlab-org/gitlab/-/labels - https://about.gitlab.com/handbook/product/categories/features/ -->