Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
141 lines (96 sloc) 5.15 KB
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "">
<html xmlns="" xml:lang="en" lang="en" id="mysite-com">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Git Process for Publishers</title>
<link rel="stylesheet" type="text/css" media="screen, print" href="css/reset.css" />
<link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
<!--[if lte IE 7>
<link rel="stylesheet" type="text/css" media="screen" href="css/screen-ie.css" />
<link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
<link rel="stylesheet" href="css/screen.css" type="text/css" media="screen" title="style" charset="utf-8"/>
<meta name="title" content="Match this with the content of the title tag above." />
<meta name="description" content="A short description of this page." />
<link rel="image_src" href="" />
<link rel="icon" href="" type="image/png" />
<link rel="shortcut icon" href="" type="image/png" />
<script type="text/javascript" src="js/mootools/mootools-core.js"></script>
<script type="text/javascript" src="js/site.js"></script>
<div id="page">
<div id="header">
<h1><a href="" rel="home">Git Process for Publishers</a></h1>
<p class="tagline">
A guide to version tracking, revision, and collaboration for open-source writing.
<ul class="accessibility">
<li><a href="#navigation">Jump to Navigation</a></li>
<li><a href="#content">Jump to Content</a></li>
<ul id="sub-navigation">
<li><a href="process.htm">Start</a></li>
<li><a href="process2.htm">Edit</a></li>
<li><a href="process3.htm">Produce</a></li>
<div id="content">
<img src="media/img/timeline_3.png" alt="timeline_3" height="486" width="500" />
<div id="main">
<h4>Legend for Chart</h4>
<p><b>Step 7</b>
Work that is viewed as complete can be merged from the work branch onto the master.</p>
<p>Writers should remember to check out the branch they want to merge their changes into. </p>
<p>Remember, changes will also need to be merged into the master. Don’t forget to check out the master branch and then perform the merge.</p>
<p><b>Step 8.</b>
The managing editor will need to review all the files for the final time. Remember, the command “git log” will allow him or her to see the list of changes to the project. Decisions will need to be made whether to merge the changes completed: that’s why a managing editor is needed.</p>
<p>During the writing process, there will probably be conflicts between the writers that need to be resolved. The “git merge” and “git pull” commands continue merging content even when conflicts exist. Chapters may need to be cleaned up manually thus requiring conflict markers being removed from view.
<p>Another option for dealing with conflicts may be to restart from the start of the chapter by undoing a merge and returning to the previous state of the branch.</p>
<p>These decisions will need to be made by the managing editor.</p>
<p><b>Step 9.</b>
Once all three chapters are complete and the managing editor is pleased with the work, everything can be merged. Afterwards, the managing editor should open up the index.htm file in a web browser to view the completed product as the end-users will experience the content.</p>
<p>Remember to use “$ git checkout master” and “$ git merge work” commands.</p>
<p>A 3-chapter electronic document, fully formatted and reviewed by multiple parties, is now available for distribution on the web.</p>
<p>Everything was completed online in a virtual paperless setting.</p>
<div id="supporting">
<ul id="navigation">
<li><a href="index.htm">Home</a></li>
<li><a href="resources.htm">Resources</a></li>
<li><a href="process.htm">Process</a></li>
<li><a href="about.htm">About</a></li>
<div id="footer">
<p class="copyright">
© 2010 by Gewgaws Lab. Some rights reserved. Content licensed under a
<a rel="license" href="">
Creative Commons Attribution-Share Alike 3.0 United States License
<a class="cc-badge" rel="license" href="">
<img alt="Creative Commons License" src="" />
<p class="project-information">
<a href="">Git for Writers repository</a>
hosted at <a href="">GitHub</a>. Learn <a href="participate.htm">how to
contribute</a> to Git for Writers.
<ul class="validators">
<li><a href="" title="Validate this page's XHTML">XHTML</a></li>
<li><a href="" title="Validate this page's CSS">CSS</a></li>