Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 511295

Summary: Merge commits cannot be created on Node
Product: [ECD] Orion Reporter: Remy Suen <remy.suen>
Component: GitAssignee: Remy Suen <remy.suen>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3    
Version: 13.0   
Target Milestone: 14.0   
Hardware: All   
OS: All   
See Also: https://git.eclipse.org/r/89848
Whiteboard:
Bug Depends on:    
Bug Blocks: 510950    
Attachments:
Description Flags
JavaScript file that will generate to a merge conflict. none

Description Remy Suen CLA 2017-01-30 05:10:42 EST 
Created attachment 266513 [details]
JavaScript file that will generate to a merge conflict.

1. Download the attached file.
2. Place it in your orion.client/modules/orionode/ folder.
3. $ node bug.js
4. $ node server.js -workspace merge-commit-bug
5. Fire up a browser and open the 'Git' page. Notice that it says 'Merge in progress'.
6. Select the conflicted file to resolve it (just the <> carets don't matter but if they bother you feel free to "resolve" the file by getting rid of them).
7. Enter in a commit message and some random author and committer details.
8. Click on the 'Commit' button.
9. A commit gets created but the page still says 'Merge in progress'.
10.
$ cd merge-commit-bug
$ git status
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   test.txt

no changes added to commit (use "git add" and/or "git commit -a")
Comment 1 Eclipse Genie CLA 2017-01-30 05:23:30 EST 
New Gerrit change created: https://git.eclipse.org/r/89848