manuelselbach

Theory:

your git repository can have more than one remote server; In this case we want to have two:

one for our private repository on gitlab (will be the default one, called origin) one to be connected to the source repo on github, to be able to pull new changes (will be called upstream) How to make a private fork from github to gitlab

# 1. clone the github project in your workspace

manuelselbach

git merge --no-commit --no-ff <branch-name>

# To abort merge
git merge --abort

manuelselbach

lib.headerimage = COA
lib.headerimage {
    10 = FILES
    10 {
        references {
            data = levelmedia:-1, slide
            listNum = 0
        }
        renderObj = IMG_RESOURCE
        renderObj {

manuelselbach

<?php

class SomeController
{
  /**
   * Example method
   */
  public function someAction()
  {
    $results = $this->someRespository->findAll();