A merge request (MR) is a request from someone to merge in code from one branch to another. You can create a MR from Assembla by clicking on New Merge Request, which is in almost all of git sub-tabs.
You’ll be asked to select a “From” branch and a “To” branch. Once you do this you’ll see that the Create Merge Request button will be enabled - only if there are changes among them - and it’ll show you some information like commits, files affected, and tickets affected.
You need to enter a MR summary in order to enable the Create MR button. The description is an optional field.
Note: If you want to delete the FROM branch after MR is merged or ignored just mark the checkbox.
Merge Request Options
Once your MR is created you can find it in the Merge Requests sub-tab. To access it just click on it. In your MR page, you’ll see some options:
Upvote or downvote a MR: After each revision you can upvote a MR or downvote it.
Merge and Close button: If everything is OK you can merge the changes and close the request by simply clicking "merge".
Ignore button: If a MR was created by accident or if it’s irrelevant you ignore it.
New version: If there is a new commit on the branch, a new version of the MR will automatically be created.
Inline Comments
You can add inline comments by clicking on the green icon on each line of code. To see the files you just need to go to the “Files Affected” tab, and click on the “view diff” link.
Inline Comments can be found in a few places:
a) Affected files where it was submitted
b) Comments sub-tab - which can be enabled from the Git Tool Settings page
- The inline comments have a direct link which will redirect you to the affected file and it will open the inline comment automatically.
- Each inline comment has a reply button where you can easily respond to someone - it will send a mention to that person.
Mark Comments Resolved
Once you have pushed the changes requested by a reviewer, simply click the comment in the merge request interface to mark it "resolved." This provides a handy indicator of the status of the changes implicated by their comment.
Have questions? Email us support@assembla.com