Site Search

About searching

Search results

    Git Merge 2017

    28 February 2017

    Git Merge 2017 Posted by s.aragon on 28 … of Emma Jane Hogbin Westby's talk "Teaching People Git" at Git Merge 2015 . Her talk is inspiring, improves teaching …

    Read more

    Some takeaways from Git Merge 2018

    01 May 2018

    Some takeaways from Git Merge 2018 Posted by s.aragon on 1 May … On 8th March I was lucky enough to go to the annual Git conference: ' Git Merge ', held this year in …

    Read more

    Top tips for using Mercurial

    05 February 2014

    … system, and I use it for all of my projects. Much like git, bazaar, darcs and so on, it's a distributed version … long-lived lines of development, where we periodically merge back and forth. One of the ways we keep things … into the development branch. Sometimes these show up as merge conflicts, and if the changes are particularly …

    Read more

    Top tips for using Mercurial

    05 February 2014

    … system, and I use it for all of my projects. Much like git, bazaar, darcs and so on, it's a distributed version … long-lived lines of development, where we periodically merge back and forth. One of the ways we keep things … into the development branch. Sometimes these show up as merge conflicts, and if the changes are particularly …

    Read more

    GitLab World Tour London

    23 November 2016

    … : an online "place to learn about Version Control with Git and GitLab" and have a great time with other users. … used to provide resources built from the files on one’s Git repositories. For example, you can provide PDF based on … a issue for the website, send an solution for that issue, merge the solution into the development environment and, …

    Read more

    Code for Thought: More on GIT

    11 May 2023

    Code for Thought: More on GIT Posted by d.barclay on 11 May 2023 - … Gesis at the Leibniz Institute in Germany. The topic is GIT, where it comes from, the reasons behind its name, and … In particular, they focus on how to deal with and avoid merge conflicts, branching patterns and features such as …

    Read more

    Automating unit testing with Continuous Integration

    23 May 2022

    … Python 3.7 or above, and some basic experience with using Git and an account on GitHub , to follow this guide. … (replacing username with your own GitHub username): $ git clone https://github.com/username/ci-guide-example.git $ … it can indicate the state of a branch following a merge from another branch. For example, after development on …

    Read more

    A concise guide to reproducible MATLAB projects

    06 July 2022

    … be handled by your version control system (most likely, git) - e.g. as text files, and not a PDF, word document or … if they don’t already. Spending time learning how to use git, for instance, will pay dividends. Why use version … copies and archives of your code. A VCS also allows you to merge one branch into another; so when you’re happy with …

    Read more

    Software Carpentry for NHS Clinical Bioinformatics course

    11 November 2015

    … and manipulation in the command line; mastering the basic Git workflow; parsing XML files; and writing tested and … bring their own laptops. We got our students to create new git repositories for every program they made and had them … when to. Best bit: Pairing up students to try and make merge conflicts using GitHub. This got everyone's energy up …

    Read more

    Computational Mathematics with Jupyter

    02 February 2017

    … Corlay. Vidar T. Fauske demonstrated nbdime , a Git diffing and merging tool for Jupyter notebooks. Why do … images as Base64 strings which makes hard to diff and merge the notebook. Nbdime can show the diff of two notebook …

    Read more