From b57525835241053071a180afb9afbe8df65af29a Mon Sep 17 00:00:00 2001 From: todtb Date: Tue, 8 Aug 2023 01:11:03 +0000 Subject: [PATCH 1/2] Add new_projects.md --- new_projects.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 new_projects.md diff --git a/new_projects.md b/new_projects.md new file mode 100644 index 0000000..5cacac4 --- /dev/null +++ b/new_projects.md @@ -0,0 +1,6 @@ +# New projects + +## Initializing the repo +1) Create the repo first +2) Push an empty commit to the `main` branch with the message `init` +3) All further work to be merged from a branch on a fork \ No newline at end of file From 9dd595d5dec3cc177ac90703449682bb813e34a9 Mon Sep 17 00:00:00 2001 From: todtb Date: Tue, 8 Aug 2023 18:20:28 -0400 Subject: [PATCH 2/2] Update new_projects --- new_projects.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/new_projects.md b/new_projects.md index 5cacac4..1fa11db 100644 --- a/new_projects.md +++ b/new_projects.md @@ -1,6 +1,12 @@ # New projects -## Initializing the repo -1) Create the repo first -2) Push an empty commit to the `main` branch with the message `init` -3) All further work to be merged from a branch on a fork \ No newline at end of file +## Initializing the repository +1) Create the repository on at `git.tams.tech/tws` first and clone +2) Push an empty commit to the `main` branch with the message 'init': + `git commit --alow-empty -m 'init'` +3) All further work to be merged from a branch on a fork + 1) Return to the web interface at `git.tams.tech/tws` and click the "fork" button + 2) Clone your forked repo + 3) Add the upstream (ex: `git remote add upstream ssh://git@git.tams.tech:2222/TWS/meta-tasks.git`) + 4) You can then fetch upstream changes and merge them to your fork + 5) Opening PRs should typically be from your fork's work branch to the upstream main