Databases
StackOverflow2013
Postsdbo
POGood git process for feature branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGood git process for feature branches
    primarykey
    data
    text
    <p>We've been going back and forth in our team about the best process for individual developers to work with feature branches, rebasing, and etc. The below is what we came up with (with input from some mailing lists) but it seems a little convoluted &amp; has a lot of steps. There are other SO questions with some answer examples that seem similar and simpler.</p> <p>Is this a good workflow? How could it be simplified (if at all) or changed?</p> <pre><code>git checkout develop # all developer work is off of this branch git pull --rebase # make sure local develop is up-to-date git checkout -b my-nifty-feature-559876 # create your feature branch; I like to put Pivotal story ID in it for convenience; not required # do your work, make sure all tests still pass, etc. COMMIT FREQUENTLY git commit -m "First part of my nifty feature working; now on to the back-end." # fetch latest remote develop and rebase your local feature branch on this. git fetch git rebase origin/develop # Local feature branch now has latest origin/develop code as base # repeat above 3 frequently as you're working # when you're done, pull and rebase one last time, make sure tests pass, then final commit with Pivotal comment git commit -m "It works! [Fixes #559876]" # commit when done. Include comment like that for Pivotal integration git fetch git rebase origin/develop # Local feature branch now has latest origin/develop code as base git checkout develop # switch back to develop git pull git merge my-nifty-feature-559876 # This should be a simple FF merge git push origin develop # send to github git branch -d my-nifty-feature-559876 # you can get rid of your feature branch </code></pre>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USdenishaskin
    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
    1. VO
      singulars
      1. POGood git process for feature branches
      1. USjurglic
      1. VTFavorite
    2. VO
      singulars
      1. POGood git process for feature branches
      1. This table or related slice is empty.
      1. VTDownMod
    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