Merge Branch
An error occurred with previous merge. The new changes to forum were committed to git, but not pushed to repository. The forum branch now as the new code change and is ready to be merged.
An error occurred with previous merge. The new changes to forum were committed to git, but not pushed to repository. The forum branch now as the new code change and is ready to be merged.
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b forum origin/forum
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/master git merge --no-ff forum
Step 4. Push the result of the merge to GitLab
git push origin master
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.