-
Archives
- January 2020
- May 2019
- April 2019
- March 2019
- February 2019
- December 2018
- November 2018
- October 2018
- September 2018
- August 2018
- May 2018
- April 2018
- March 2018
- February 2018
- January 2018
- December 2017
- November 2017
- October 2017
- September 2017
- August 2017
- June 2017
- May 2017
- April 2017
- March 2017
- February 2017
- January 2017
- December 2016
- November 2016
- October 2016
- September 2016
- August 2016
- July 2016
- June 2016
- May 2016
- March 2016
- February 2016
- January 2016
- December 2015
- November 2015
- October 2015
- September 2015
- August 2015
- September 2014
- August 2014
- June 2014
- March 2014
- February 2014
- January 2014
- December 2013
- November 2013
- October 2013
- September 2013
- August 2013
- May 2013
- April 2013
- March 2013
- February 2013
- December 2012
- November 2012
- October 2012
- September 2012
- August 2012
- June 2012
- May 2012
- April 2012
- March 2012
- February 2012
- January 2012
- December 2011
- November 2011
- October 2011
- September 2011
- August 2011
- June 2011
- May 2011
- April 2011
- March 2011
- February 2011
- January 2011
- November 2010
- October 2010
- September 2010
- August 2010
- April 2010
- February 2010
- December 2009
- November 2009
- August 2009
- May 2009
- January 2009
- December 2008
- October 2008
- September 2008
- August 2008
- July 2008
- May 2008
- April 2008
- March 2008
- February 2008
- January 2008
- December 2007
- November 2007
- October 2007
- September 2007
- August 2007
- April 2007
- March 2007
- February 2007
- January 2007
- December 2006
- November 2006
- October 2006
- September 2006
- August 2006
- July 2006
- June 2006
- April 2006
- March 2006
- January 2006
- December 2005
- November 2005
- October 2005
- April 2004
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 diff, git, meld, merge, merge conflict, mergetool, version control system
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 agenda, configuration management system, course, git, Helsinki, idempotent, kurssi, puppet, version control system
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 git, linux, network, synchronization, vcs, version control system
Comments Off on Git from Offline to Network