When conflicts happen while merging, git will add for you something like that in each problematic file : [code language="bash"] <<<<<<< HEAD text that is in the HEAD branch ======= text that is in the dev branch >>>>>>> dev [/code] To resolve the conflicts, simply remove the text that you...
Have you ever wanted to copy some songs of your iTunes library onto a USB key? Here is a little script to do just that. Here is how to do it : Gather all the songs you want to export in a playlist Launch the following script with Script Editor for...
1. Checkout to master branch [code language="bash"]git checkout master[/code] 2. Merge with dev [code language="bash"]git merge dev[/code] 3. Push [code language="bash"]git push -u origin master[/code]
First install a new desktop environment like xfce : [code language="bash"]apt-get install kali-defaults kali-root-login desktop-base xfce4 xfce4-places-plugin xfce4-goodies[/code] Then switch environments with : [code language="bash"]update-alternatives --config x-session-manager[/code]