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

Lots of minor translation errors fixed

Browse source
This commit is contained in:
Jens Bremmekamp 2013-12-22 00:06:00 +01:00
parent 1082b2971d
commit 059cb003a2
17 changed files with 80 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/levels/remote/mergeManyFeatures.js
View file

@ -13,6 +13,51 @@ exports.level = {
"compareOnlyMaster": true,
"startDialog": {
"en_US": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Why not merge?",
"",
"In order to push new updates to the remote, all you need to do is *incorporate* the latest changes from the remote. That means you can either rebase *or* merge in the remote branch (e.g. `o/master`).",
"",
"So if you can do either method, why have the lessons focused on rebasing so far? Why is there no love for `merge` when working with remotes?",
""
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"Theres a lot of debate about the tradeoffs between merging and rebasing in the development community. Here are the general pros / cons of rebasing:",
"",
"Pros:",
"",
"* Rebasing makes your commit tree look very clean since everything is in a straight line",
"",
"Cons:",
"",
"* Rebasing modifies the (apparent) history of the commit tree.",
"",
"For example, commit `C1` can be rebased *past* `C3`. It then appears that the work for `C1'` came after `C3` when in reality it was completed beforehand.",
"",
"Some developers love to preserve history and thus prefer merging. Others (like myself) prefer having a clean commit tree and prefer rebasing. It all comes down to preferences :D"
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"For this level, let's try to solve the previous level but with *merging* instead. It may get a bit hairy but it illustrates the point well"
]
}
}
]
},
"de_DE": {
"childViews": [
{
"type": "ModalAlert",