sameersbn / sameersbn/docker-gitlab
Reg: Merge Requests issue
Nobody has claimed this yet.
- Dominant language
- Shell
- Stars
- 8.1k
- Forks
- 2.1k
- Avg merge
- 17h 47m
- Merged PRs (30d)
- 7
Description
Hi Team,
Kudos to the team for releasing versions with new feature and attractive UI.
In our local machine, I'm using gitlab [Community Edition] through docker image (sameersbn/docker-gitlab)
. Previously gitlab merge request made under gitlab-satellites directory, after the latest releases from 8 onwards, gitlab-satellites directory was removed, hope it can be done via code.
While merging from UI, it encounters an error like " This merge request contains merge conflicts. Please, resolve these conflicts or merge this request manually. " . But, it is working fine in command Line. BTW, I want to know the merge request location.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start by reproducing the merge request conflict in the same Dockerized GitLab setup and compare the UI result with the command-line merge. Check how GitLab 8+ handles the removed gitlab-satellites directory and identify where merge request data or operations are located. Done means the UI behavior and relevant location are clearly identified.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- docker, git
- Domain
- devops
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100