Resolve Merge Conflict with 'git mergetool' and meld

If you work with your friends on the same git repository, you might edit the same file. If you edit the bottom and your friend edits the top, git merges the changes automatically. If two users edit the same line, … Continue reading

Posted in Uncategorized | Tagged , , , , , , | 1 Comment

Aikataulu – Linuxin keskitetty hallinta – ict4tn011-10 – loppusyksy 2016

Hallitse palvelimiasi ja työasemiasi Pupetilla. Kuvaile tavoitetila, ja anna Pupetin tehdä tarvittavat säädöt ja asetukset. Pupettia käyttävät mm. Google, Mozilla ja Wikipedia. USA:n valtio suojaa Windows- ja Linux-työasemansa Pupetilla (US Government Security Baseline).

Posted in Uncategorized | Tagged , , , , , , , , | 52 Comments

Git from Offline to Network

Syncrhonize Git project over network, even if you started it locally. Git is the version control system designed by Linus and used by Google, Facebook, Microsoft, Rails and of course Linux. You can do it too. You can start tracking … Continue reading

Posted in Uncategorized | Tagged , , , , , | Comments Off on Git from Offline to Network