136 private links
Like many things in git, zdiff3 is one of those hidden features that I wish was set as the default option. It has made my day to day development much easier when it comes to resolving conflicts and it's a nice little improvement over diff3. If you want to enable zdiff3 by default on versions of git >= 2.35, you can run git config --global merge.conflictStyle zdiff3. If you just want to give it a test run next time without setting that option to see if you like it you can also run git checkout --conflict zdiff3 ./conflicted/file/path to checkout just the one conflicted file again with the zdiff3 algorithm.
Aptik is a open source package that simplify backup and restore of PPAs, Applications and Packages after a fresh installation or upgradation of Debian based Ubuntu, Linux Mint and other Ubuntu derivatives.
To edit a configuration file, you must check it out first. Each configuration file is an XML that is paired with an XSD file. The XML file contains configuration settings and the corresponding XSD files is used to validate the XML file.