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

Bug 515613

Summary: [node] Can't merge two different histories together
Product: [ECD] Orion Reporter: Remy Suen <remy.suen>
Component: GitAssignee: Remy Suen <remy.suen>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3    
Version: 14.0   
Target Milestone: 15.0   
Hardware: All   
OS: All   
Whiteboard:

Description Remy Suen CLA 2017-04-22 16:35:50 EDT 
1. Run this from the CLI.

$ mkdir unrelated
$ cd unrelated 
$ git init
$ echo "A" > tmp.txt
$ git co --orphan other
$ git add tmp.txt
$ git commit -m "x"
$ git co --orphan master
$ git commit -m "y"

2. 

$ node modules/orionode/server.js -w unrelated

3. Open the Git page.

http://localhost:8081/git/git-repository.html

4. Click the 'Reference:' dropdown to point 'master' at 'other'.
5. Click the 'Merge the content from the branch to your active branch'.
6. You'll get a yellow CONFLICTING warning even though the content of the two unrelated branches are identical so there should be zero conflicts.