Merge
Merge one branch into another from the repository's Merge page. Merging requires write access to the repository.
Step 1 - Open the Merge Form
From a non-empty repository, open the merge page and choose a source and a target branch, tag, or commit.
Step 2 - Optionally Set a Commit Message
Type a custom message for the merge commit, up to the same length limit as an annotated tag message. Leave it blank and git.eu generates a default message describing the merge.
Step 3 - Submit
git.eu always creates a merge commit, even when the merge could fast-forward - the history always shows an explicit merge point, never a silent fast-forward. A merge whose source is already merged into the target, including merging a branch into itself, is rejected as a no-op with no commit created.
Conflicts
When the two branches changed the same lines, the merge is rejected before anything is written - no partial or conflicted commit ever lands in the repository. The result lists every conflicting file so you can resolve them elsewhere (for example, by pushing a merge resolved locally) and try again.