@matheusbsbs / matheus-bagliano / commits / 067744bd5d
Fork 0

Tutorial: do not use 'git resolve'.

Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Nov 7, 2005 at 22:50 UTC 067744bd5dc23540745788b5aa11d4e9dea1ceef
1 file changed +8 -7
Documentation/tutorial.txt
+8 -7
@@ -965,9 +965,9 @@ Merging external work
965 It's usually much more common that you merge with somebody else than
966 merging with your own branches, so it's worth pointing out that git
967 makes that very easy too, and in fact, it's not that different from
968 -doing a `git resolve`. In fact, a remote merge ends up being nothing
968 +doing a `git merge`. In fact, a remote merge ends up being nothing
969 more than "fetch the work from a remote repository into a temporary tag"
970 -followed by a `git resolve`.
970 +followed by a `git merge`.
971
972 Fetching from a remote repository is done by, unsurprisingly,
973 `git fetch`:
@@ -1206,7 +1206,8 @@ In our example of only two files, we did not have unchanged
1206 files so only 'example' resulted in collapsing, but in real-life
1207 large projects, only small number of files change in one commit,
1208 and this 'collapsing' tends to trivially merge most of the paths
1209 -fairly quickly, leaving only the real changes in non-zero stages.
1209 +fairly quickly, leaving only a handful the real changes in non-zero
1210 +stages.
1211
1212 To look at only non-zero stages, use `\--unmerged` flag:
1213
@@ -1615,8 +1616,8 @@ in both of them. You could merge in 'diff-fix' first and then
1616 'commit-fix' next, like this:
1617
1618 ------------
1618 -$ git resolve master diff-fix 'Merge fix in diff-fix'
1619 -$ git resolve master commit-fix 'Merge fix in commit-fix'
1619 +$ git merge 'Merge fix in diff-fix' master diff-fix
1620 +$ git merge 'Merge fix in commit-fix' master commit-fix
1621 ------------
1622
1623 Which would result in:
@@ -1649,8 +1650,8 @@ $ git reset --hard master~2
1650 ------------
1651
1652 You can make sure 'git show-branch' matches the state before
1652 -those two 'git resolve' you just did. Then, instead of running
1653 -two 'git resolve' commands in a row, you would pull these two
1653 +those two 'git merge' you just did. Then, instead of running
1654 +two 'git merge' commands in a row, you would pull these two
1655 branch heads (this is known as 'making an Octopus'):
1656
1657 ------------