Github user rajarajan-g commented on the issue:

    https://github.com/apache/zeppelin/pull/1464
  
    @jongyoul : Hey i was quite busy for sometime.
    
    I was trying to resolve the commit issues that you have pointed out.
    
    but while during rebase i am getting below error
    
    ```
    git rebase master
    First, rewinding head to replay your work on top of it...
    Applying: Code changes for ZEPPELIN-796
    Using index info to reconstruct a base tree...
    M   
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
    M   zeppelin-web/src/components/noteName-create/notename.controller.js
    M   zeppelin-web/src/components/noteName-import/note-import-dialog.html
    M   zeppelin-web/src/components/noteName-import/notenameImport.controller.js
    M   zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
    <stdin>:18: trailing whitespace.
     * @throws DuplicateNameException 
    <stdin>:40: trailing whitespace.
     * @throws DuplicateNameException 
    <stdin>:98: trailing whitespace.
       * @throws DuplicateNameException 
    <stdin>:175: trailing whitespace.
        
    <stdin>:187: trailing whitespace.
          conn.send(serializeMessage(new Message(OP.ERROR_DIALOG).put("info", 
    warning: squelched 21 whitespace errors
    warning: 26 lines add whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging 
zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
    CONFLICT (content): Merge conflict in 
zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
    Auto-merging 
zeppelin-web/src/components/noteName-import/notenameImport.controller.js
    CONFLICT (content): Merge conflict in 
zeppelin-web/src/components/noteName-import/notenameImport.controller.js
    Auto-merging 
zeppelin-web/src/components/noteName-import/note-import-dialog.html
    Auto-merging 
zeppelin-web/src/components/noteName-create/notename.controller.js
    CONFLICT (content): Merge conflict in 
zeppelin-web/src/components/noteName-create/notename.controller.js
    Auto-merging 
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
    Failed to merge in the changes.
    Patch failed at 0001 Code changes for ZEPPELIN-796
    The copy of the patch that failed is found in:
       /home/rajarajang/Workspace/stsWorksapce/zeppelin/.git/rebase-apply/patch
    
    When you have resolved this problem, run "git rebase --continue".
    If you prefer to skip this patch, run "git rebase --skip" instead.
    To check out the original branch and stop rebasing, run "git rebase 
--abort".
    ```
    Even though after i resolve the conflicts, again it shows conflict again 
and not able to remove that unnecessary commit that you pointed out. Please 
help me out on resolving that issue
    
    Please let me know if anyone has faced this issue and also please let me if 
there is a way to resolve this issue.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to