quyle92

## Git_mergetool_tutorial_with_Vim.md

      
              1 file
            
          
              128 forks
            
          
              33 comments
            
          
              525 stars
            
          
                karenyyng
                / Git_mergetool_tutorial_with_Vim.md
            
            
              Last active
              July 23, 2024 05:30
            
              
                How to use `git mergetool` to resolve conflicts in Vim / NeoVim
              
          
    Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool

Finding out what mergetool editors are supported


mergetool simple code example for vimdiff

Resolving conflict from a Git pull


Other great references and tutorials


## xampp_php7_xdebug.md

      
              1 file
            
          
              135 forks
            
          
              135 comments
            
          
              1344 stars
            
          
                odan
                / xampp_php7_xdebug.md
            
            
              Last active
              June 28, 2024 12:58
            
              
                Installing Xdebug for XAMPP 
              
          
    Installing Xdebug for XAMPP with PHP 7.x


New: XAMPP - XDebug Setup for PHP 8

Requirements


XAMPP for Windows: https://www.apachefriends.org/download.html
Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019

Setup


## customize WordPress toolbar 6
function add_toolbar_items($wp_admin_bar) {
			$wp_admin_bar->add_node( array(
			'id'		=> 'supportlink',
			'title' => 'Contact support',
			'href' => 'mailto:support@domain.com',
		) );
}

add_action('admin_bar_menu', 'add_toolbar_items', 999);

## macos_node_update.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              2 stars
            
          
                wmakeev
                / macos_node_update.md
            
            
              Last active
              February 13, 2023 20:56
            
              
                [macOS Brew update Node] #node #brew
              
          
How to install specific NodeJS version
How do I downgrade node or install a specific previous version using homebrew?

Current linked node version,
$ brew search node
	function add_toolbar_items($wp_admin_bar) {
	$wp_admin_bar->add_node( array(
	'id' => 'supportlink',
	'title' => 'Contact support',
	'href' => 'mailto:support@domain.com',
	) );
	}

	add_action('admin_bar_menu', 'add_toolbar_items', 999);