Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <blockquote> <p>But is there a way that when I push my branch to a remote branch, the base branch is set to the remote branch I specified?</p> </blockquote> <p>That means avoiding:</p> <pre><code>x--x--x (branch1) x--x--x ==&gt; push ==&gt; \ y--y--y (origin/remote-name) y--y--y--M </code></pre> <p>But rather get:</p> <pre><code> y--y--y--x--x--x </code></pre> <p>That is only possible if, <strong>before pushing, your <code>branch1</code> has been rebased on top of <code>origin/remote_name</code></strong>:</p> <pre><code>git fetch origin git checkout branch1 git rebase origin/remote_name git push branch1:remote_name </code></pre> <hr> <blockquote> <p>Our scenario is like Master branch is the, let's say live app, every time we found a defect, we create a fix-branch (should be branched off the development branch), create our fixes and push the fix-branch to development branch first where testing and QA happens. Once finalized, push it back to master.</p> </blockquote> <p>In your case, you need to rebase and push to a different branch, one which is <em>not</em> <code>dev</code>, because <code>dev</code> represents a different development effort, one of continuous modifications, as opposed as puctual fixes.</p> <p>Create a <strong>release branch</strong> which represents the hot-fixes that you integrate one by one on top of <code>master</code> (prod).</p> <p>Each time you see a bug:</p> <ul> <li>create a branch for that <code>bug</code>,</li> <li>fix the bug</li> <li>rebase the bug branch on top of the <code>release_branch</code></li> <li>push the <code>bug</code> branch for QA to review</li> <li>once reviewed, push it to <code>master</code></li> </ul>
    singulars
    1. This table or related slice is empty.
    1. POPush a branch to a remote on GitHub with the base branch set to a remote branch name
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USVonC
    1. USVonC
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POPush a branch to a remote on GitHub with the base branch set to a remote branch name
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COIs there really no alternative, maybe I just explained it wrong. Our scenario is like Master branch is the, let's say live app, every time we found a defect, we create a fix-branch (should be branched off the development branch), create our fixes and push the fix-branch to development branch first where testing and QA happens. Once finalized, push it back to master.
      singulars
      1. PO
      1. USFinks
    2. CO@Finks Ok, I have edited my answer to adapt it to your workflow.
      singulars
      1. PO
      1. USVonC
 

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