mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-30 01:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add configuration for Galician language

Browse source 
Add translations for intro1

Add translations for intro2

Fix intro

Add translations for intro3

Add translations for intro4

Fix intro - rebasing

Add translations for rampup1

Add translations for level index

add dialog translations

Fix dialogs

add transations over rebase module

rebase

add advances transations

Add Strings file in intl

Fix hit message

Add translations to mixed module

Fix mixed

Add rampup1

Add rampup2

Add rampup3

Add rampup4

Add translations to move1

Add move2

Add remote1

Add remote6

Add fakeTeamwork

Add fetch file

Add fetchArgs

fetch rebase

Tracking

source nothing

Remote branches

push many features

Merge many feautures

Pull

Pull args

push args

Push args2

Fix erratas
This commit is contained in:
Victor Lopez Romero 2019-01-25 13:48:31 +01:00
parent 1471f08c99
commit e26044e0a9
40 changed files with 2405 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/levels/remote/pull.js
View file

@ -8,6 +8,7 @@ exports.level = {
"zh_TW": "git pull",
"es_AR": "git pull",
"pt_BR": "Git Pull",
"gl" : "Git Pull",
"de_DE": "Git Pull",
"ja" : "Git Pull",
"fr_FR": "Git pull",
@ -21,6 +22,7 @@ exports.level = {
"zh_TW": "只要下 git pull 這個指令即可",
"es_AR": "Simplemente ¡hacé git pull!",
"pt_BR": "Basta executar git pull!",
"gl" : "Sinxelamente fai git pull!",
"de_DE": "Führe einfach git pull aus.",
"ja" : "単にgit pullを実行！",
"fr_FR": "Utilisez facilement git pull !",
@ -265,6 +267,65 @@ exports.level = {
}
]
},
"gl": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Git Pull",
"",
"Agora que vimos cómo traer os datos dun repositorio remoto con `git fetch`, ¡actualicemos o noso traballo local para reflexar eses cambios!",
"",
"Realmente hai varias formas de facer esto: unha vez que teñas os commits dispoñibles localmente, podes integralos coma se foran commits comúns de outras ramas. Esto significa que poderías executar comandos como:",
"",
"* `git cherry-pick o/master`",
"* `git rebase o/master`",
"* `git merge o/master`",
"* etc., etc.",
"",
"De feito, o fluxo de traballo de *fetchear* os cambios remotos e depois *mesturalos* é tan común que git inclúe un comando que fai as dúas operacións nunha sola: ¡`giti pull`!"
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Vexamos primeiro un `fetch` e un `merge` executados secuencialmente"
],
"afterMarkdowns": [
"Boom: descargamos `C3` cun `fetch` e logo mesturámolos con `git merge o/master`. Agora a nosa rama `master` reflexa o novo traballo do remoto (neste caso, chamado `origin`)"
],
"command": "git fetch; git merge o/master",
"beforeCommand": "git clone; git commit; git fakeTeamwork"
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"¿Qué pasaría se usáramos `git pull` en cambio?"
],
"afterMarkdowns": [
"¡O mesmo! Eso debía deixar ben claro que `git pull` é básicamente un atallo para facer `git fetch` seguido pola mestura ca rama que houbésemos descargado."
],
"command": "git pull",
"beforeCommand": "git clone; git commit; git fakeTeamwork"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"Exploraremos os detalles de `git pull` despois (incluíndo as súas operacións e parámetros), pero por agora probarémolo neste nivel.",
"",
"Lémbrate: podes resolver este comando sinxelamente con `fetch` e `merge`, pero eso costaríache un comando extra :P"
]
}
}
]
},
"zh_TW": {
"childViews": [
{