New

Resolve a Merge Conflict

Lists the conflicted files, and shows how to finish or abandon the merge.

Open each file and you will find the two versions between <<<<<<< and >>>>>>>, separated by =======. Keep what should survive, delete the three marker lines entirely, then stage the file. Nothing is lost while you decide: git merge --abort returns the branch exactly to where it was.

When you need this: When a pull or merge stops with "Automatic merge failed; fix conflicts".

Command


        

    







    2 views
    0 copies
    





    
    Log in to rate




    

        
Related in this category

        

                                                
                        Generate SSH key for GitHub
                    
                                                                
                        Clone repository via SSH
                    
                                                                
                        Create and switch to new branch
                    
                                                                
                        Git Stash and Apply
                    
                                    

    





        

        
            
                
            
            Log in to save
        
        
Free account. Save snippets into your own collections.