StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Each of your co workers should create micro-branches [aka feature branches] (from your main branch; as should you) for each of their small iterations which they can push to your server at any time to allow them to be seen. As each micro-iteration is completed they (and you) would rebase that iteration on top of your main branch to see if it is still working and ready for integration with your main branch. </p> <p>There is a race here to keep iterations short and small so that they 'just work' and are acceptable, and merged or fast forwarded into your main branch. In some cases the different iterations will interact and the appropriate developers can collaborate using the pushed/pulled micro branches to avoid in-fighting;-)</p> <p>If there is a lot of cross running features in development then you can use a workflow (<code>git help workflows</code>) similar to that used by the Git maintainer, of Master <- Next <- pu (potential updates) <- contributor branches, with pu being rewound after every cycle with contributors pulling a fresh view of that re-wound branch to see how their changes fit into the larger whole.</p> <hr> <p>Patch submission</p> <p>Once you have a completed piece of work in your 'main' branch you should again fetch/pull the upstream master (and any release candidates they may have) and rebase your changes on top of them to truly be up to date.</p> <p>Now you would prepare a patch series from your branch using <code>git format-patch</code>, most likely having prepared a cover letter to introduce the series. Then use <code>git send-email</code> to send them in. It is worth practising though by sending them to yourself, and looking up any instructions provided by the upstream project. For example <a href="https://github.com/git/git/blob/master/Documentation/SubmittingPatches" rel="nofollow">Git's SubmittingPatches</a>.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload