Databases
StackOverflow2013
Postsdbo
POGit workflow when you cant push or pull
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit workflow when you cant push or pull
    primarykey
    data
    text
    <p>This is a <a href="https://stackoverflow.com/questions/6217187/keeping-repositories-in-sync-without-being-able-to-push-and-pull-commits">recurring</a> question for me, but I'd like to reiterate.</p> <p>Quickly explain my situation: I am in an environment where I don't have a a git server, nor a shared partition or any common point among the coders. Don't have, will not have, can not have. Period.</p> <p>I'm trying to come up with a workflow solution, to even in that environment we manage keep our reps at reasonable sync.</p> <p>The solution I'm trying at the moment uses a discussion group to distribute patches, two main branches and with a seemingly short workflow, follows:</p> <ul> <li>The branches are <code>marster</code> and <code>yours</code></li> <li><code>master</code> is the sync branch, which will keep you up to date and track what other deves still don't have of your code.</li> <li><code>yours</code> will be your new master, and is where your final code should be. You do not work in <code>master</code>.</li> <li>everybody sends patches to the discussion list.</li> <li>I'm considering that <strong>very</strong> rarely two people will work in the same file.</li> </ul> <p>There are two main actions in the workflow:</p> <p><strong>Generate patches:</strong></p> <ol> <li>Got to <code>yours</code></li> <li>Generate patches from <code>master</code> (<code>git format-patch master</code>)</li> <li>Go to <code>master</code></li> <li>Merge <code>yours</code> into <code>master</code></li> <li><strong>></strong> Go to <code>yours</code>, continue working with <code>yours</code></li> </ol> <p><strong>Apply patches:</strong></p> <ol> <li>Go to <code>master</code> branch</li> <li>Apply received patches</li> <li>Go to <code>yours</code> branch</li> <li>Merge <code>master</code> into <code>yours</code></li> <li><strong>></strong> Continue working with <code>yours</code></li> </ol> <p>If I got it right, this should keep a <code>master</code> branch reasonably in sync with everyone else.</p> <p>Not that the <code>yours</code> branch is only to help in keeping track of what other people have or not.</p> <p>There are a few problems I'm trying to figure if will be too much hassle:</p> <ul> <li>Order of patches applied?</li> <li>How to avoid and detect when someone misses a patch?</li> <li>How much problem can be when someone misses a patch?</li> <li>Other problems this can generate I haven't even thought of?</li> </ul> <p>Thanks!</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USfilippo
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit workflow when you cant push or pull
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit workflow when you cant push or pull
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit workflow when you cant push or pull
      1. This table or related slice is empty.
      1. VTUpMod
    1. COi think it would be way easier to setup a git server accessible by all your team members. afaik `format-patch`/`am` will generate unique commit hashes per repository (different committer). so even if the trees in your repository are the same and history is basically the same, merging/comparing and talking about a particular commit will be a pita (because everybody has different commits, which just happen to evaluate to the same patches). save yourself the hassle and setup a server or get accounts on one of the many hosting sites (github, gitourious, etc.) — they offer private repositories too.
      singulars
      1. POGit workflow when you cant push or pull
      1. USknittl
    2. COman.. I *know* that this would be the best. But right now, as I said, I can't (really can't) and to be honest, kind of don't want to - just for the challenge in trying to figure out a way :)
      singulars
      1. POGit workflow when you cant push or pull
      1. USfilippo
    3. COwhy can't you? if your project is open source you get even free accounts on the aforementioned sites (plus repo.or.cz). for brain-food: have you had a look at `git bundle`?
      singulars
      1. POGit workflow when you cant push or pull
      1. USknittl
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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