Databases
StackOverflow2013
Postsdbo
POAppropriate Git workflow for thesis with server involved
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POAppropriate Git workflow for thesis with server involved
    primarykey
    data
    text
    <p>I'm just starting to use git for my thesis and my question is what will be an appropriate workflow for me. Here my prerequisites:</p> <p>Hardware used:</p> <ul> <li>Laptop A used at home</li> <li>Laptop B a netbook used when I'm in the library</li> <li>Desktop computer at university</li> <li>Private filespace on a server of my university which also runs git (preinstalled by the university, nice, isn't it?)</li> </ul> <p>What I did until know is writing my thesis with LaTeX and copying it between all these computers by hand. It often happens that I'm writing sth. on one machine but then I have a day off and I don't know where's my most recent version. In these cases I used diff to compare and find out what document is the most recent one.</p> <p>A little bit of reading about git showed me that it would help me a lot. I thought of something like having a central repo at the server and pushing/pulling to/from it with all the computers.</p> <p>I now have created a bare repo on the server and I have created local repositories (by <code>git init</code>) on each of the computers.</p> <p>But I'm not sure if this was right: Right now all computers are in sync so all local repos contain the same files/versions. I have pushed to the bare repo on the server from my Laptop A.</p> <p>I tried to pull from the server repo to my Desktop computer:</p> <pre><code>git pull origin master </code></pre> <p>output:</p> <pre><code>* branch master -&gt; FETCH_HEAD Merge made by the 'recursive' strategy. </code></pre> <p>That created a branch on my Desktop computer, if I understood it correctly. Should I apply any further operations after this before I start working on the desktop pc?</p> <p>Another try was:</p> <pre><code>git pull origin master:master </code></pre> <p>output:</p> <pre><code> ! [rejected] master -&gt; master (non-fast-forward) </code></pre> <p>As far as I read it in the Git book that's an expected behaviour though I can't say why. Wouldn't this prevent that a new branch is created each time I pull?</p> <p>Anyway, I now read over many posts here on stackoverflow and also some chapter in the official git book, but I must say, my head is humming a little bit. </p> <p>I don't know if the workflow I started here is correct at all for what I want to achieve. Maybe I should not use the server git but just clone to the filespace? Could somebody get me on the right track?</p> <p>Thanks a lot.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USabsurd
    1. USabsurd
    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. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POAppropriate Git workflow for thesis with server involved
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POAppropriate Git workflow for thesis with server involved
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POAppropriate Git workflow for thesis with server involved
      1. USpolarwar
      1. VTFavorite
    1. This table or related slice is empty.
 

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