mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 17:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2873 commits 8 branches 0 tags 104 MiB
Commit graph

2873 commits

This branch
This branch
All branches
Author SHA1 Message Date
juanmv94
d45c7400b9 Test and level corrections after fetch/pull fixes 2024-04-27 18:13:32 +02:00
juanmv94
5322fd6605 Fixed many fetch/pull issues on #1138 2024-04-26 02:41:44 +02:00
Peter Cottle
03a82ce78f
Merge pull request #1140 from pomeh/1139-add-direct-link-to-levels 
Resolves #1139: can use a direct permalink to a specific level
 2024-04-24 09:56:11 -04:00
Romain Guerin
d09fc9e3c3 Resolves #1139: can use a direct permalink to a specific level 2024-04-24 10:09:37 +00:00
Peter Cottle
caf480d956 Resolves #1138 2024-04-22 07:32:06 -04:00
Peter Cottle
f12c640fac
Merge pull request #1136 from pcottle/dependabot/npm_and_yarn/vite-4.5.3 
Bump vite from 4.5.2 to 4.5.3
 2024-04-04 10:32:49 -04:00
dependabot[bot]
a4b32164ba
Bump vite from 4.5.2 to 4.5.3 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.3/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.3/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-04 01:53:58 +00:00
Peter Cottle
b86a9d704c Resolves #1134 -- show solution on gist levels 2024-03-30 18:18:42 -04:00
Peter Cottle
ac94520a99 Resolves #1128: edit the dialog a bit 2024-03-30 18:18:42 -04:00
Peter Cottle
d3afaf059b
Merge pull request #1133 from nicheexpress/main 
Update upload-artifact for faster performance
 2024-03-27 17:01:42 -04:00
smooth sail
a1063fe997
Update upload-artifact for faster preformence 2024-03-27 10:26:33 +02:00
Peter Cottle
ba355b4dc3
Merge pull request #1130 from pcottle/dependabot/npm_and_yarn/es5-ext-0.10.63 2024-02-26 20:41:23 -08:00
dependabot[bot]
1ca6d42a45
Bump es5-ext from 0.10.53 to 0.10.63 
Bumps [es5-ext](https://github.com/medikoo/es5-ext) from 0.10.53 to 0.10.63.
- [Release notes](https://github.com/medikoo/es5-ext/releases)
- [Changelog](https://github.com/medikoo/es5-ext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es5-ext/compare/v0.10.53...v0.10.63)

---
updated-dependencies:
- dependency-name: es5-ext
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-27 03:58:11 +00:00
Peter Cottle
df4dafaec0
Merge pull request #1129 from DeadEmbed/patch-1 
Corrected typo in multipleParents.js
 2024-02-25 11:54:48 -08:00
DeadEmbed
de6f1bb9e4
Corrected typo in multipleParents.js 2024-02-25 22:30:56 +03:00
Peter Cottle
4f52fc5cb6 Resolves #1128: make it clear that side should be the name of the branch 2024-02-19 15:40:58 -05:00
Peter Cottle
de070be14e
Merge pull request #1126 from Angra974/vite-as-index_html-loader 
Added vitejs as a launcher for index.html. package.json
 2024-02-07 09:14:27 -05:00
Thierry Parlier
ff6754e26a
Update package.json 
Removed required engines as it seems the test are done with another lower version
 2024-02-07 07:56:50 +04:00
Thierry Parlier
99d921d858 Update package.json to add node engine required version. Downgraded vite to v4 2024-02-06 20:01:16 +04:00
Thierry Parlier
80e96b54f7
Delete pnpm-lock.yaml 
The main project use Yarn. Need to add this to my .gitignore file
 2024-02-06 12:47:31 +04:00
Thierry Parlier
307841074b
Update package.json 
No need to build with vite as it was not supposed to be used like this in this project.
 2024-02-06 12:42:17 +04:00
Thierry Parlier
acc6555ded Added vitejs as a launcher for index.html. package.json 'prepare' command is used to create the index.html file to be used with vite 2024-02-06 12:16:17 +04:00
Peter Cottle
40ddfcab77
Merge pull request #1123 from chistrobal93/main 
Translate command-not-supported to es_AR, es_MX and es_ES
 2024-01-12 10:43:25 -05:00
Cristóbal
1c18197ac2
Translate command-not-supported to es_AR, es_MX and es_ES 
There is no error message for git-error-command-not-supported, a common error that occurs when typing any command incorrectly.
 2024-01-11 18:50:53 -03:00
Peter Cottle
e2ed36b179
Merge pull request #1122 from acHeMatta/traducirEsMx 
Translate the fakeTeamwork lesson to es_MX
 2024-01-07 08:39:15 -07:00
HumbertoMata
eee0720dc2 Translate the fakeTeamwork lesson to es_MX 2024-01-06 21:45:01 -06:00
Peter Cottle
9f82317780
Merge pull request #1120 from Magador/feat/remote-fakeTeamwork-merge 
feat: command to simulate Merge/Pull Request
 2023-12-16 11:05:08 -05:00
Lucie Lenglet
acffcc1616 feat: command to simulate Merge/Pull Request 
- Adds `git merge(M|P)R <source_branch> <target_branch> [--delete-after-merge]` command
to simulate a Merge/Pull Request being merged into the target branch
- The optional flag `--delete-after-merge` will remove the merged branch on the origin tree
  - The local remote branch remains as it is Git default behavior, even after `git fetch`
(it would require `git fetch --prune` support to automatically prune remote tracking branches)
- You can push a branch with a deleted remote tracking branch on origin, the ref will just update.

Resolves #1057
 2023-12-15 19:32:47 +01:00
Peter Cottle
99bc0ca8c5
Merge pull request #1119 from waldyrious/replay-pr-1112 
Update pt_BR translations (replay of #1112)
 2023-11-26 21:53:23 -05:00
Max Oliver
badfd715b9 Update pt_BR translations (replay of #1112) 2023-11-27 00:09:38 +00:00
Peter Cottle
7532b67b52
Merge pull request #1117 from maxoliverbr/main 
Update strings.js
 2023-11-21 21:17:35 -05:00
Peter Cottle
3dfcc2b27d Resolves #1115 clarify git branch f 2023-11-21 11:36:33 -05:00
Max Oliver
621d666e9b
Update strings.js 
Some more PT-BR translations.
 2023-11-20 01:20:18 -03:00
Peter Cottle
6596ee2601
Merge pull request #1116 from jianghurong/feature/new-levels 
feat: Gulpfile update
 2023-11-17 11:12:06 -05:00
jianghurong
efeee39973 feat: Gulpfile update 2023-11-17 18:26:57 +08:00
Peter Cottle
4a07d70927
Merge pull request #1114 from maxoliverbr/main 
pt_BR - Rollback couple of translations
 2023-11-13 10:24:44 -05:00
Max Oliver
d40a46e4e5
Merge pull request #2 from maxoliverbr/maxoliverbr-patch-rollback 
Update strings.js 
Rollback couple of translations.
 2023-11-13 11:39:32 -03:00
Max Oliver
466df1fecb
Update strings.js 
Rollback:
'pt_BR': 'O repositório remoto divergiu do repositório local, então enviar suas mudanças não é um simples fast forward (e por isso seu push foi rejeitado). Por favor, faça pull das novas mudanças do repositório remoto, incorpore-os a este ramo, e tente novamente. Você pode fazê-lo com git pull ou git pull --rebase',

'pt_BR': 'Não se pode fazer reset no modo detached. Use checkout se quiser se mover',
 2023-11-13 11:38:38 -03:00
Peter Cottle
35bcb7e8a0
Merge pull request #1113 from pcottle/revert-1112-main 
Revert "pt_BR Translations fix and add."
 2023-11-12 13:55:42 -05:00
Peter Cottle
c3d0f1ca1f
Revert "pt_BR Translations fix and add." 2023-11-12 13:55:31 -05:00
Peter Cottle
59c30a035d
Merge pull request #1112 from maxoliverbr/main 
pt_BR Translations fix and add.
 2023-11-12 12:28:52 -05:00
Max Oliver
a88ef6066e
Update strings.js 
Fixed typos in pt_BR
 2023-11-12 00:04:22 -03:00
Max Oliver
6480d3e24a
Update strings.js 
Fixed typo
 2023-11-11 23:59:47 -03:00
Max Oliver
bccec0b8dd
Merge pull request #1 from maxoliverbr/maxoliverbr-pt_BR-fixes-new 
Update strings.js with pt_BR correct and new translations.
 2023-11-11 23:54:31 -03:00
Max Oliver
dc37508e19
Update strings.js 
Fixed some translations and added some that were missing in pt_BR.
 2023-11-11 23:41:06 -03:00
Peter Cottle
fc34ba07cf
Create FUNDING.yml 
trying out a sponsorship button...
 2023-11-09 10:11:19 -05:00
Peter Cottle
42867f588f
Merge pull request #1110 from pcottle/dependabot/npm_and_yarn/browserify-sign-4.2.2 
Bump browserify-sign from 4.0.4 to 4.2.2
 2023-10-27 15:59:09 -04:00
dependabot[bot]
4d1110781f
Bump browserify-sign from 4.0.4 to 4.2.2 
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.0.4 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.0.4...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-27 00:19:21 +00:00
Peter Cottle
19f279f246
Merge pull request #1109 from pcottle/dependabot/npm_and_yarn/babel/traverse-7.23.2 2023-10-18 12:31:08 -04:00
dependabot[bot]
d2b49791ca
Bump @babel/traverse from 7.17.3 to 7.23.2 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.17.3 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-17 19:20:23 +00:00