Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating the merge procedure to removing synchronisation with Perforce repository #228

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Updating the merge procedure to removing synchronisation with Perforce repository #228

wants to merge 6 commits into from

Commits on May 30, 2023

  1. Removing synchronisation with Perforce repository.

    @rptb1
    rptb1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    35949db View commit details
    Browse the repository at this point in the history

  2. Resolving FIXME comments with links to procedures and issues.

    @rptb1
    rptb1 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    9dddbc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Correcting cross-references to steps and reintroducing rebase instruc… 

    …tions that were formerly in a Perfofce push step.
    @rptb1
    rptb1 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    72b1f65 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Correcting references to "perforce" remote when resolving conflict wi… 

    …th remote.
    @rptb1
    rptb1 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    38e2a57 View commit details
    Browse the repository at this point in the history

  2. Correcting invocation of git pull --rebase to avoid discarding the … 

    …merge commit. Git violates POLA once again.
    @rptb1
    rptb1 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    d957641 View commit details
    Browse the repository at this point in the history

  3. Generalising instructions for obtaining CI results.

    @rptb1
    rptb1 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    dfec8bc View commit details
    Browse the repository at this point in the history