0

I'm editing a file in a merge request in GitLab's Web IDE. While I'm working, someone else commits changes to the same file, which creates a merge conflict. When I'm ready to commit my changes, GitLab won't let me.

How do I fix this? I know how resolve a merge conflict between two commits, but this is different; I'm in the Web IDE, and it won't let me commit.

Improve this question
3
  • 1. Make a backup of your changes 2. It looks like you changed one file on the same branch than the other person. So create a branch and commit changes on a branch. This way you will be able to open a merge request and fix conflicts with provided tools. Commented yesterday
  • Thank you for pointing me in the right direction. HOW to create a new branch remained unclear. I asked Perplexity and it recommended two methods that didn't work because they involved clicking window controls that our GitLab doesn't have. Apparently the Web IDE UI changes constantly, making any directions quickly obsolete. I tried clicking Source Control, then the down-arrow on the Commit button, which opened a menu with one choice, "Create new branch and commit." But when I typed a branch name in the provided box and pressed Enter, it didn't create a new branch; it didn't do anything. Commented 17 hours ago
  • Finally I copied the full text of each changed file to a text editor and saved it to a new file. I can create a new branch from GitLab proper and drop those in. The immediate question will become moot in an hour or so, because Windows Update is clamoring to apply some patches, and the reboot will wipe out the problem instance of Web IDE. But I would like to know if there's a better way to do this, because it's likely to happen again. Commented 17 hours ago
Related questions
5436
How do I resolve merge conflicts in a Git repository?
596
Resolving a Git conflict with binary files
219
Forking Git repository from GitHub to GitLab
Load 7 more related questions Show fewer related questions

0

Reset to default

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.