tl;dr:
- Import other repos as branches
- Move the files in the other repos into subdirectories for each project
- Rebase the other repo branches onto the master
- Merge everything into master in order
Note: placeholders are in angle brackets.
# This gist is for a stack overflow question regarding the testing of the calls to async methods | |
##################################### | |
# Implementation to be tested | |
import asyncio | |
import json | |
import unittest | |
from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch | |
from uuid import uuid4 |
name: Test | |
on: | |
push: | |
branches: | |
- main | |
- features/** | |
- dependabot/** | |
pull_request: | |
branches: |
#~/.bash_profile | |
for f in /etc/bash_completion.d/*; do source $f; done |
This is an alternative to submodules:
This gives us a way to have a workflow somewhat similar to the submodule workflow without using submodules (which we will cover in Submodules). We can keep branches with other related projects in our repository and subtree merge them into our project occasionally. It is nice in some ways, for example all the code is committed to a single place. However, it has other drawbacks in that it’s a bit more complex and easier to make mistakes in reintegrating changes or accidentally pushing a branch into an unrelated repository.
Say you want to merge repository a
into b
. This can be accomplished with one command:
git subtree add --prefix=a ../a master
Based off of: http://docs.sequelizejs.com/en/1.7.0/articles/express/
Create and initialize your a directory for your Express application.
$ mkdir sequelize-demo
(any_branch)
git checkout dev
(dev)
git pull
(dev)
git checkout -b USxxx_descr
#create new branch for the US
...(USxxx_descr)
git add (file) (file) (etc...)
or git add --all
(USxxx_descr)
git status
check that everything is correct (only files you really want to change are added)# the IP(s) on which your node server is running. I chose port 3000. | |
upstream app_geoforce { | |
server 127.0.0.1:3000; | |
} | |
upstream app_pcodes{ | |
server 127.0.0.1:3001; | |
} |
/** | |
* XmlHttpRequest's getAllResponseHeaders() method returns a string of response | |
* headers according to the format described here: | |
* http://www.w3.org/TR/XMLHttpRequest/#the-getallresponseheaders-method | |
* This method parses that string into a user-friendly key/value pair object. | |
*/ | |
function parseResponseHeaders(headerStr) { | |
var headers = {}; | |
if (!headerStr) { | |
return headers; |