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

Bug 347953

Summary: [Client]Git status:Need UI action "git reset --hard origin/master" to sync to remote when conflicts happens
Product: [ECD] Orion Reporter: libing wang <libingw>
Component: GitAssignee: libing wang <libingw>
Status: RESOLVED INVALID QA Contact:
Severity: normal    
Priority: P3 CC: simon_kaegi, Szymon.Brandys
Version: 0.2   
Target Milestone: 1.0 RC1   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Bug Depends on: 347951    
Bug Blocks:    

Description libing wang CLA 2011-06-01 10:37:26 EDT 

    


    


      



        
          Comment 1
        

        
          libing wang CLA

        

        
        

        
          2011-06-01 10:40:10 EDT
        

      






We need a page action "undo last commit".
In the case of conflicts happen user can ignore the last commit and pull again.
In bug 343961 I mentioned this but that will just checkout all the unstaged files.

    


    


      



        
          Comment 2
        

        
          libing wang CLA

        

        
        

        
          2011-06-06 13:24:30 EDT
        

      






as "git reset --hard origin/master" will better suit the case , I changed the summary.

    


    


      



        
          Comment 3
        

        
          libing wang CLA

        

        
        

        
          2011-06-10 10:32:29 EDT
        

      






Talked to Boris and Simon , we need  to rethink about it . Re-target it to post 0.2.

    


    


      



        
          Comment 4
        

        
          libing wang CLA

        

        
        

        
          2012-10-04 17:27:40 EDT
        

      






nologer valid.