Versions Compared

Old Version 11

changes.mady.by.user Matthias Lühr

Saved on

compared with

New Version 12

changes.mady.by.user Christian Hauschke

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Expand
titleLayering UQAM updates over fork of core


Code Block
languagebash
# Locally clone VIVO fork
git clone https://github.com/UQAM-VIVO-2/VIVO.git VIVO-uqam-2
cd VIVO-uqam-2/

# Create working branch
git checkout -b prep

# Pull down a copy of UQAM updates into a local branch
git remote add upstream https://github.com/UQAM-VIVO/VIVO.git
git fetch upstream

# Magic: layer UQAM updates over fork of core project
git cherry-pick `git log upstream/upstream-master -n 1 --pretty=%H`

# Push to UQAM-2 GitHub
git push origin prep

# In GitHub, make pull-request to core project



Notes 

  1. Introduction
  2. Michel: Ability to manage french and english editing for UQAM. Changed 70-80 classes and a lot of FTL files. Goal: Finishing the french semantics in the sprint. English structure of pages looks strange sometimes. They were not able to test all pages in French right now.

Actions

  •