Skip to content

Commit 2297f47

Browse files
author
Bertrand Thomas
committed
Merge branch 'feature/gitlab-best-practices' into 'main'
Start migrating pages See merge request devpro-labs/enablement/information-technology-guide!3
2 parents 8869663 + fef777e commit 2297f47

87 files changed

Lines changed: 659 additions & 204 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Information Technology Guide
22

33
[![GitHub Action CI status](https://github.com/devpro/information-technology-guide/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/devpro/information-technology-guide/actions/workflows/ci.yml)
4-
[![GitLab Pipeline Status](https://gitlab.com/devpro-labs/docs/information-technology-guide/badges/main/pipeline.svg)](https://gitlab.com/devpro-labs/docs/information-technology-guide/-/pipelines)
4+
[![GitLab Pipeline Status](https://gitlab.com/devpro-labs/enablement/information-technology-guide/badges/main/pipeline.svg)](https://gitlab.com/devpro-labs/enablement/information-technology-guide/-/pipelines)
55
<!-- [![GitLab Pipeline Status](https://img.shields.io/gitlab/pipeline/devpro-labs/docs/information-technology-guide/main?label=Pipeline&logo=gitlab)](https://gitlab.com/devpro-labs/docs/information-technology-guide/-/pipelines) -->
66

77
Resources to help you learn about Information Technology (IT).
@@ -13,5 +13,4 @@ Resources to help you learn about Information Technology (IT).
1313
* [Communities](docs/communities/communities.md)
1414
* [Companies](docs/companies/companies.md)
1515
* [Foundations](docs/foundations/foundations.md)
16-
* [Methodology](docs/methodology/methodology.md)
17-
* [Training](docs/training/training.md)
16+
* [Standards](docs/standards/standards.md)

‎docs/communities/go/go-file-organization.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
🌐 [golang-standards/project-layout](https://github.com/golang-standards/project-layout)
44

5+
<!-- https://github.com/Avksenchik/golang-project-template -->
6+
57
## General view
68

79
```txt

‎docs/communities/sfconservancy/git-recipes.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Git Recipes
2+
3+
## Branches
4+
5+
### master to main branch migration
6+
7+
```bash
8+
git branch -m master main
9+
git push -u origin main
10+
```
11+
12+
## Migrations
13+
14+
### SVN (Subversion) to git migration
15+
16+
* [Migrating to Git from SVN](https://www.gitkraken.com/blog/migrating-git-svn) by GitKraken
17+
* [Learn how to migrate from SVN to Git, including history](https://docs.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git) by Azure DevOps
18+
19+
## Updates
20+
21+
### Self-update git on Windows
22+
23+
```msdos
24+
git update-git-for-windows
25+
```

‎docs/communities/sfconservancy/git.md‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,23 @@
77
## Content
88

99
* [Git CLI](git-cli.md)
10+
* [Git Recipes](git-recipes.md)
1011

11-
## Learn
12+
## Education
1213

13-
* [GitHub Guides > GitFlow](https://guides.github.com/introduction/flow/)
1414
* [GitKraken > Learn Git](https://www.gitkraken.com/learn/git)
1515

16-
## Recipes
16+
## Branch management
1717

18-
* Rename your `master` branch to `main` (original idea from [hanselman.com](https://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspx))
18+
* [What is the best Git branch strategy?](https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy) by GitKraken
1919

20-
```bash
21-
git branch -m master main
22-
git push -u origin main
23-
```
20+
### GitHub flow
2421

25-
* SVN (Subversion) to git migration
26-
27-
* [GitKraken - Migrating to Git from SVN](https://www.gitkraken.com/blog/migrating-git-svn)
28-
* [Azure DevOps - Learn how to migrate from Subversion (SVN) to Git, including history](https://docs.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git)
29-
30-
* Self-update git on Windows
31-
32-
```msdos
33-
git update-git-for-windows
34-
```
22+
🌐 [guides.github.com/introduction/flow](https://guides.github.com/introduction/flow/)
3523

3624
## Tools
3725

38-
* [GitKraken](https://www.gitkraken.com/): legendary Git GUI client for Windows, Mac & Linux
39-
* [pre-commit](https://pre-commit.com/): a framework for managing and maintaining multi-language pre-commit hooks
26+
Name | Description
27+
----------------------------------------|-------------------------------------------------------------------------
28+
[GitKraken](https://www.gitkraken.com/) | Legendary Git GUI client for Windows, Mac & Linux
29+
[pre-commit](https://pre-commit.com/) | A framework for managing and maintaining multi-language pre-commit hooks

‎docs/communities/sfconservancy/sfconservancy.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Software Freedom Conservancy
22

3-
> Software Freedom Conservancy is a nonprofit organization centered around ethical technology.
4-
> Our mission is to ensure the right to repair, improve and reinstall software.
5-
> We promote and defend these rights through fostering free and open source software (FOSS) projects, driving initiatives that actively make technology more inclusive, and advancing policy strategies that defend FOSS (such as copyleft).
3+
> Software Freedom Conservancy is a nonprofit organization centered around ethical technology.\
4+
> Our mission is to ensure the right to repair, improve and reinstall software.\
5+
> We promote and defend these rights through fostering FOSS projects, driving initiatives that actively make technology more inclusive, and advancing policy strategies that defend FOSS (such as copyleft).
66
77
🌐 [sfconservancy.org](https://sfconservancy.org/)
88

‎docs/companies/37signals/37signals.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# 37signals
2+
3+
[37signals.com](https://37signals.com/)

‎docs/companies/37signals/kamal.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Kamal
2+
3+
[kamal-deploy.org](https://kamal-deploy.org/) ([basecamp/kamal](https://github.com/basecamp/kamal))

docs/foundations/cncf/argo.md renamed to docs/companies/akuity/argo.md

File renamed without changes.

‎docs/companies/akuity/argocd.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Argo CD
2+
3+
🌐 [argoproj.github.io/cd](https://argoproj.github.io/cd/)
4+
5+
2.9
6+
7+
[What's New in Argo CD v2.9? - In-line Kustomize Patches, Ignore Differences in ApplicationSets](https://www.youtube.com/watch?v=ypkk48G71oo)

‎docs/companies/bytedance/bytedance.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ByteDance
2+
3+
[bytedance.com](https://www.bytedance.com/)
4+
5+
## Open Source
6+
7+
[webinfra.org](https://webinfra.org/) ([web-infra-dev](https://github.com/web-infra-dev))
8+
9+
### Open Source projects
10+
11+
* [Rspack](rspack.md)

0 commit comments

Comments
 (0)