Roland's homepage

My random knot in the Web

Articles tagged with "git-merge"

  1. Merging local git repositories

    For a long time, I’ve had a directory ~/templates to store template files for several programs.

    For historical reasons, my LaTeX templates have been stored under ~/latex/templates.

    Both have been under git revision control since 2006; before that I used rcs.

    I want to merge both local repositories under ~/templates. This articla documents how that was done.

Page 1 / 1