Menu

Commit [r4445]  Maximize  Restore  History

More chapter 4 review and update for 1.8.

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging.mergetracking): Minor working tweak,
it's not just for bug fixes that we want a 1.8 client.

(svn.branchmerge.basicmerging.stayinsync): Introduce the
new-in-1.8 terminology of "automatic" merges. Update examples
to use forthcoming ch4 demo repository.

(Keeping a Branch in Sync Without Merge Tracking): Redo the
examples in this sidebar to use an old (1.4.6) client and the
demo repository. The examples still work fine with a 1.5+ client
but the 1.4 client better keeps less hidden and (IMHO) makes for
a better example.

(Why Not Use Patches Instead?): Use demo repository in this sidebar's
examples.

(svn.branchmerge.basicmerging.stayinsync.subtree): Tweak some awkward
wording.

ptburba 2013-02-20

changed /trunk/en/book/ch04-branching-and-merging.xml
/trunk/en/book/ch04-branching-and-merging.xml Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.