• @MaBe, #6 implies for me that @Robin would have write rights to https://github.com/espruino/EspruinoDocs­.git.

    As far as I know only a few have write access to https://github.com/espruino/EspruinoDocs­.git

    The majority works through a fork of https://github.com/espruino/EspruinoDocs­.git placed into their own github account (their own remote repository) / repository space.

    For the steps below, assume github account ao: github.com/ao/EspruionoDocs.

    Steps - in git Web UI and terminal / command window:

    1. fork .../espruiono/EspruinoDocs into .../ao/EspruinoDocs in git Web UI
    2. From such remote, master is cloned into the local w/ git clone ...
    3. A branch is checked out - created - on local w/ git checkout -b feature/fun (switching between branches is without -b)
    4. Files are changed / deleted / added
    5. Changed files can be listed w/ git status
    6. Changes in files can be displayed w/ git diff
    7. Commit-worthy changed files from list in 4. are added to the staging area w/ git add ...
    8. Staged files are committed (locally) w/ git commit -m "commit message about the change"
    9. The local commit is then pushed to remote (the fork) w/ git push
    10. In github Web UI on remote repo / fork of oa, a merge request (MR) is created from pushed branch
      a) to master of fork - .../ao/EspruinoDocs - and also
      b) to master of origin - .../espruinoDocs.
    11. MR towards master of fork is merged (can be merged by ao, because ao is the owner if the repo)
    12. MR towards master of origin cannot be merged by ao. @Gordon has to do that because it is 'his' - locked down - repo.

    The reason for making MRs from feature branches of fork and not from master branch of fork (after merging of feature branch) is that there may be multiple feature branches in different stages in the fork, but only the desired and completed should go into the MR towards the master of the origin. It may well be that some feature branches never even make it beyond being branches on the fork.

    9.a) is not required. The changes will come with the update of the fork into the fork. The changes may be changed because most likely @Gorden will make some changes to the MRed feature branch before merging it into the origin.

    Do I miss something here? Is there a shorter, more direct path?

About

Avatar for allObjects @allObjects started