Databases
StackOverflow2013
Postsdbo
POI really need help understanding how my git server is set up and what my branches are doing
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POI really need help understanding how my git server is set up and what my branches are doing
    primarykey
    data
    text
    <p>I am really sorry this is such a vague request but I need some git help. I know enough to do something pretty stupid, but not enough to know how to avoid doing something very stupid.</p> <p>I have a remote git server and a working directory on that server. I just need a 'master' for version 1.0 with a development branch and a 'master' for version 1.1 with it's own development branch. I need to be able to work on these independently. I only want one repository so perhaps there would be a master with a 1.0 branch with its own devel branch and a 1.1 branch with its own devel branch.</p> <p>I don't mind experimenting, if I have a back-out plan, and don't mind learning the hard way but I'm not the only one who uses this repository and I've been asked to make a version 1.1 workspace for the group and I don't know the best way to do that. I also don't know how to back out of anything dumb that I may have done.</p> <p>After hours and hours of googling and trying to find git books and cookbooks, nothing I've come across helps me because I don't know how to refer to my remote branch properly, among other things, and there is something fundamental that I'm failing to comprehend. I'm at the point I don't know where else to turn. I've seen many posts that get me close to what I need but I can't get past a few hurdles without being able to refer to my set up since git doesn't click for me, yet, and I can't extrapolate others' recommendations onto mine without asking more specific questions.</p> <p>Is somebody willing to do a little back and forth question/response session with me to help me understand git's brains and verify my setup?</p> <p>Here's a bit to get us started:</p> <pre><code>SERVER$ git branch -r origin/devel origin/master SERVER$ git branch -l * devel master SERVER$ git branch -a * devel master remotes/origin/devel remotes/origin/master SERVER$ git remote show origin * remote origin Fetch URL: /git/sold.git Push URL: /git/sold.git HEAD branch: master Remote branches: devel tracked master tracked Local branch configured for 'git pull': master merges with remote master Local refs configured for 'git push': devel pushes to devel (up to date) master pushes to master (up to date) </code></pre> <p>Thanks in advance.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USharperville
    plurals
    1. 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. POI really need help understanding how my git server is set up and what my branches are doing
      1. USScott Presnell
      1. VTFavorite
    2. VO
      singulars
      1. POI really need help understanding how my git server is set up and what my branches are doing
      1. This table or related slice is empty.
      1. VTUpMod
    1. COwhat's your question? I'm sure you can get help here but it's better if you provide one precise question per post.
      singulars
      1. POI really need help understanding how my git server is set up and what my branches are doing
      1. USCharlesB
    2. COI'd like to make the current codebase a snapshot and create versions 1.1 and 2.0 from it, both of which can be worked on as-needed. Following @dmasi's instructions below, when I try `git checkout master`, I get "fatal: This operation must be run in a work tree`. I'm spending my time now trying to figure out what exactly that is and why I don't have one because the answer appears to be 'clone it locally' or 'define your work-tree'. I don't know how one can clone a repo inside itself (seems counter-intuitive) nor do I know where my work-tree is. Suggestions are most welcomed.
      singulars
      1. POI really need help understanding how my git server is set up and what my branches are doing
      1. USharperville
    3. COOne of the many things that trip me up is the wording in the documentation. For example: "A git pull without arguments will in addition merge the remote master branch into the current master branch, if any." Here, we have a "remote master" and a "current master". Is the "current master" the "local master"? When does "current" mean "local" and not "master"? That's why my original question is so vague: I keep getting tripped up at each step of this process. In case you couldn't tell, this is my first time ever using a source control and the lingo/assumptions do not mesh well with my brain.
      singulars
      1. POI really need help understanding how my git server is set up and what my branches are doing
      1. USharperville
 

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