Skip to main content

Merge to DIP Gitlab main branches

1. Push MIP Git repositories to Gitlab​

info

The Mission Element Lead must ensure that all operators that have made any Git repository changes that they wish to be carried forward into the R2D2 Gitlab perform the following procedures at the end of the mission.

  1. Open the /cvah/git/ folder via VS Code to have access to all of the MIP's local Git repositories within a single workspace:

    code /cvah/git

  2. For each Git repository folder, perform the following:

    1. From the VS Code file explorer pane, select the Git repository folder

    2. Looking at the bottom-left corner on the blue bar of the VS Code window, ensure that the branch is not to your personal branch and not main main

    NOTE: This step assumes that you created a personal branch for the repo IAW 262COS-GIT-SOP-002 - DIP Gitlab Procedures

    1. From the Source Control tab, commit any remaining changes and sync (pull + push) the repo to the DIP Gitlab

  3. Within the Gitlab web UI - for each Git repository that was synced, initiate a merge request from you personal branch to the main branch

  4. Prompt the Mission Element Lead (or their designee) to review your merge request for merging into the main branch

2. Push Fileserver Git repositories to Gitlab​

  1. Open the /cvah/share/ folder (mapped to smb://fileserver/share) via VS Code to have access to all of the Fileserver's local Git repositories within a single workspace:

    code /cvah/share

  2. For each Git repository folder, perform the following:

    1. From the VS Code file explorer pane, select the Git repository folder

    2. Looking at the bottom-left corner on the blue bar of the VS Code window, ensure that the branch is set to fileserver

    3. From the Source Control tab, commit any remaining changes and sync (pull + push) the repo to the DIP Gitlab

  3. Within the Gitlab web UI - for each Git repository that was synced, initiate a merge request from the fileserver branch to the main branch

  4. Prompt the Mission Element Lead (or their designee) to review the merge request for merging fileserver into the main branch

3. Review merge requests into main branch​

Merge Request Review Guidelines

Depending on the repository there are certain things that you would be reason for rejection for being merged into main, for example:

  • Massive changes or deviations to the original repository structure
  • Unnecessary deletions of pre-existing file/folder deletions
  • Unnecessary renaming of pre-existing file/folder deletions
  • Unnecessary creation of new files/folders

Push changes to DIP Gitlab 2. Fileserver branch DIP Gitlab 3. Merge requests 4. Reconsile changes 5. Export to folder 6. Zip 7. Put on CD