AAugustine

A Guide to Using Azure DevOps with GitHub

Background

Azure DevOps provides developers with a platform that supports collaboration across the entire software development lifecycle. GitHub is the home for all developers, and provides not only a best-in-class source code management platform, but also many exciting new capabilities like GitHub Actions, GitHub Packages, and GitHub Advanced Security.

AAugustine

Organization archetypes

The intention of this document is to provide some guidance and suggestions to customers who are wondering how they should structure organizations and teams in their GitHub Enterprise environment. The idea isn't to give hard and fast rules on which approach is better than the other, but to give examples of when one approach might be preferable to another depending on the use case.

1. A single organization with direct organization membership for repository access (not teams)

          ________________
          |     Org      |
          |    ______    |
          |   |      |\  |

| | Repo | \ |

AAugustine

TFS to Git migration strategy

Pulling history from TFS is time consuming. Please be patient and keep an eye on your migration.

Install Git-TFS with Chocolatey

We need to install the tooling git-tfs on the local machine to help convert data from the TFS format to Git.

• Go to Chocolatey Install
• Follow instructions to install Once you have installed, run command to install git-tfs
• choco install gittfs

AAugustine

#!/bin/sh

# Credits: http://stackoverflow.com/a/750191

git filter-branch -f --env-filter "
    GIT_AUTHOR_NAME='Newname'
    GIT_AUTHOR_EMAIL='new@email'
    GIT_COMMITTER_NAME='Newname'
    GIT_COMMITTER_EMAIL='new@email'
  " HEAD

AAugustine

There are four parts to a Repository

• Working directory: This is your local directiry where you make the project and make changes to the project (where you write code)
• Staging area (or index): This is the area where you need to put your project files before committing
• Local Repository: This is where you commit changes to the project before pushing to your central repository on GitHub. This corresponds with your .git folder inside your project.
• Central Repository: This is the main project on GitHub. Every team member shares a copy for this project.

Basic commands that relate to repository structure

• git add will transfer your project files from working directory to staging area
• git commit will transfer your project files from the staging area to the local repository
• git push will transfer project files from local repository to GitHub

AAugustine

Fast Forward

• One of the two Most Common
• git rebase In this most commonly used merge strategy, history is just one straight line. When you create a branch, make some commits in that branch, the time you’re ready to merge, there is no new merge on the main branch. That way main’s pointer is just moved straight forward and history is one straight line.

Recursive

• One of the two Most Common
• git merge --no-ff In Recursive merge, after you branch and make some commits, and there are some new original commits on the "main" branch. At merge time, git recurses over the branch and creates a new merge commit. The merge commit continues to have two parents.

AAugustine

#!/bin/bash

KC_REALM=<insert realm name here>
KC_USERNAME=<username here>
KC_PASSWORD=<password here>
KC_CLIENT=<client name here>
KC_CLIENT_SECRET=<client secret here>
KC_SERVER=<server address and port here>
KC_CONTEXT=auth

AAugustine

-- Login to psql and run the following

-- What is the result?
SELECT MAX(id) FROM your_table;

-- Then run...
-- This should be higher than the last result.
SELECT nextval('your_table_id_seq');

-- If it's not higher... run this set the sequence last to your highest id. 

AAugustine

var connect = require('gulp-connect'),
Proxy = require('gulp-connect-proxy');

gulp.task("server", function() {
    connect.server({
      root: "./dist",
      port: 9000,
          middleware: function (connect, opt) {
          opt.route = '/proxy';
          var proxy = new Proxy(opt);