gist: 152028


  
    
      Text only #
    
    
      
      
        embed
        
      
      
      
      raw
    
  
  
  
    
      
        
          
            
            1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

          
          
            
              # Find and replace in textmate to fix merge conflicts.
# As shown this takes the second capture group
#
# <<<<<<< HEAD:2983fjasd
# code1
# =======
# code2
# >>>>>>> master:2983rfja9sd
#
# As shown, this find and replace will take code 2.
#
# Replace HEAD, master, and capture groups as appropriate for your branches.
# Also, be sure to manually check on things.  This is for pretty specific
# circumstances, but it works for me.
#
 
FIND: \<{7} HEAD[.|\s|\S]*?(={7}\n)([.\s\S]*?)>{7} master.*?\s
REPLACE: $1
Public Clone URL:	git://gist.github.com/152028.git Give this clone URL to anyone. `git clone git://gist.github.com/152028.git gist-152028`
Embed All Files:	show embed