Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 347953 - [Client]Git status:Need UI action "git reset --hard origin/master" to sync to remote when conflicts happens
Summary: [Client]Git status:Need UI action "git reset --hard origin/master" to sync to...
Status: RESOLVED INVALID
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 1.0 RC1   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 347951
Blocks:
  Show dependency tree
 
Reported: 2011-06-01 10:37 EDT by libing wang CLA
Modified: 2012-10-04 17:27 EDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.