Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Note: The following ignores gitolite because I don't know how it works.</p> <p>Instead of tracking the master branch, each developer could track their own personal branch. When they want updates, they can merge them from the master. (It sounds like your current setup is the opposite: Everyone tracks master and is pushing manually.)</p> <p>Also, don't forget about tab completion. For me on Ubuntu using bash, typing <code>git push origin o&lt;TAB&gt;</code> will complete to <code>origin/</code> and then another <kbd>Tab</kbd> will show a list of available branches.</p> <hr> <h1>Create personal branches</h1> <p>If your integrator has the repo checked out into <code>~/prj</code>:</p> <pre><code>integrator:~/prj$ git push origin master:trevor-personal integrator:~/prj$ git push origin master:pydave-personal </code></pre> <h1>Setup the developer's repos</h1> <p>Each developer can clone using their personal branch.</p> <pre><code>trevor:~$ git clone /path/to/master/repo.git -b trevor-personal prj pydave:~$ git clone /path/to/master/repo.git -b pydave-personal prj </code></pre> <p>Or they can checkout a new branch in their existing clone that tracks their personal branch on origin.</p> <pre><code>pydave:~/prj$ git checkout -b personal origin/pydave-personal </code></pre> <p>Alternatively, we could use set-upstream if we want to use an existing branch.</p> <pre><code>pydave:~/prj$ git branch --set-upstream personal origin/pydave-personal </code></pre> <h1>Workflow</h1> <p>Post a change to developer branch.</p> <pre><code>trevor:~/prj$ git commit -am'changed something' trevor:~/prj$ git push </code></pre> <p>Merge it.</p> <pre><code>integrator:~/prj$ git pull integrator:~/prj$ git push origin origin/trevor-personal:master </code></pre> <p>Retrieve changes from master branch. (We have to be specific about using origin's master. <code>git pull</code> will just merge changes in <code>pydave-personal</code></p> <pre><code>pydave:~/prj$ git pull origin master </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POdealing with long personal branch names in git and gitolite
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USidbrii
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThanks for the detailed suggestions! BTW, gitolite uses ssh. ... Trying to apply your suggestions to my situation, if my integrator pushes the "blessed" branch for a developer, like so: `git push origin master:refs/personal/DEVELOPER/FROM_INTEGRATOR`, this appears to create a new branch on the remote repo. However, the developer is unable to clone it: `git clone remote-host:repo-name -b refs/personal/DEVELOPER/FROM_INTEGRATOR`, produces: `cloning into repo-name ... warning: Remote branch refs/personal/DEVELOPER/FROM_INTEGRATOR not found in upstream origin, using HEAD instead`. ???
      singulars
      1. PO
      1. USTrevor
 

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