Assembla FAQ and Documentation

What is it?

Merge request is a request to someone to merge in code from one repository to another.

What can it be used for?

Most common use cases are:

• to exchange code between different repositories (forks/git-tabs)
• to review and discuss code before merging in a feature branch.

Usage

To send a merge request:

1. Go to "Contribute Code" or "Review Code" subtab in Git tool

2. Create new merge reqeust

3. Select source:

• this is your code that you want to be merged somewhere
• it can be a branch / tag / revision
• if you select a revision, we will create a tag named assembla-mr-request-id
• only merge requests from branches are versionable
  

4. Select target:

• this is the repository and branch to which you want to send your code
• only branches can be selected in target

5. Review changesets and affected files

6. Write summary/description and create

You can discuss any change requests when viewing them.

If you received a merge request:

1. Go to "Review Code" subtab and look for received requests

2. Review the request: assert that you want the changesets (see affected files too) in your repository and vote +1

3. If changesets are ok hit "Merge and Close". Check instructions to fix conflicts under "Get changes", if there are merge conflicts.

4. If you don't like the merge request  and you don't plan to merge it, you can ignore it

5. If you ignored merge request - you can reopen it.

Future

We are working on adding more features, like inline comments, better filtering, better integration with tickets