Databases
StackOverflow2013
Postsdbo
POComing at git from a bzr/svn background
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POComing at git from a bzr/svn background
    primarykey
    data
    text
    <p>I've been using bzr for personal programming projects across my two computers for some time now, and syncing the repositories using Dropbox. So far I haven't had any problems with the following workflow:</p> <ul> <li>(Laptop) Create bzr repository</li> <li>(Laptop) Make edits, commit changes</li> <li>(Laptop) 'bzr push' to Dropbox</li> <li>(Desktop) Create bzr repository</li> <li>(Desktop) 'bzr pull' from Dropbox</li> <li>(Desktop) Make edits, commit changes</li> <li>(Desktop) 'bzr push' back to Dropbox</li> </ul> <p>(I know it more resembles a svn workflow, using the Dropbox as the central repository, but setting up svn server on both desktop and laptop to be able to use the synced Dropbox folder as the main repository did not appeal to me at all.)</p> <p>And so on and so forth.</p> <p>But now I'm learning Rails, and Rails is all about git. I've tried to use a similar workflow, and run into grief.</p> <ul> <li>(Laptop) Create git repository</li> <li>(Laptop) Make edits, commit changes</li> <li>(Laptop) 'git clone' to Dropbox</li> <li>(Desktop) 'git clone' from Dropbox</li> <li>(Desktop) Make edits, commit changes</li> <li>(Desktop) Try to get changes into Dropbox... and here's where I run into problems.</li> </ul> <p>I've done some reading, and it appears clone was not the right command to use in the first place, and I should still be using push? 'git remote -v' is telling me:</p> <pre><code>origin /home/karpie/Dropbox/Sites/Rails (fetch) origin /home/karpie/Dropbox/Sites/Rails (push) </code></pre> <p>But push still doesn't work...</p> <pre><code>Counting objects: 214, done. Delta compression using up to 2 threads. Compressing objects: 100% (182/182), done. Writing objects: 100% (192/192), 725.23 KiB, done. Total 192 (delta 31), reused 0 (delta 0) remote: error: refusing to update checked out branch: refs/heads/master remote: error: By default, updating the current branch in a non-bare repository remote: error: is denied, because it will make the index and work tree inconsistent remote: error: with what you pushed, and will require 'git reset --hard' to match remote: error: the work tree to HEAD. remote: error: remote: error: You can set 'receive.denyCurrentBranch' configuration variable to remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into remote: error: its current branch; however, this is not recommended unless you remote: error: arranged to update its work tree to match what you pushed in some remote: error: other way. remote: error: remote: error: To squelch this message and still keep the default behaviour, set remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'. To /home/karpie/Dropbox/Sites/Rails ! [remote rejected] master -&gt; master (branch is currently checked out) error: failed to push some refs to '/home/karpie/Dropbox/Sites/Rails' </code></pre> <p>I... don't really know what any of that means and it's quite intimidating. </p> <p>So.... how can I grasp a proper workflow to use, if my way really isn't the 'git way', and how can I fix my current issue? I don't really mind nuking the repository that's currently in my Dropbox and on my laptop, as long as I don't lose what's on my desktop.</p> <p>ps. And while I do have a github account, I'd rather not make my website development code public at this current time, so I'm attempting to use Dropbox instead.</p> <p>cheers,</p> <p>Karpie</p> <p>edit: I'm thinking a GUI like Giggle might help me grasp this concept of 'branch for everything', unless anyone has any better ways of coming to grips with it,</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USsevenseacat
    1. USsevenseacat
    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. POComing at git from a bzr/svn background
      1. USElijah Wright
      1. VTFavorite
    2. VO
      singulars
      1. POComing at git from a bzr/svn background
      1. This table or related slice is empty.
      1. VTUpMod
    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