Databases
StackOverflow2013
Postsdbo
POHow to keep a git branch in sync with master
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow to keep a git branch in sync with master
    primarykey
    data
    text
    <p>At the moment git is doing my head in, I cannot come up with the best solution for the following.</p> <p>There are two branches, one called <strong>master</strong> and one called <strong>mobiledevicesupport</strong>. I want to keep mobiledevicesupport as a continuous branch that will be merged/synced with the master branch whenever mobiledevicesupport is stable. This would merge changes from mobiledevicesupport into master but also bring all the changes from master into mobiledevicesupport so that branch can continue to be worked on and the features improved or amended. This needs to work with a central repository and multiple developers.</p> <p>Please an example of similar workflows other people use or just tell me if this idea is stupid and I should consider other options. At the moment the workflow seems sound, but I just don't know how I can make git work this way.</p> <p>Thanks, all help much appreciated.</p> <p>Update 1: If I was to merge master into mobiledevicesupport and mobiledevice support into master, do I get replicated commits across both branches. Or is git smart enough to work out that I have pulled the latest changes from branch A into branch B and add merge commit C to branch B. And I have pulled the latest changes from branch B into branch A and add merge commit D to branch A?</p> <p>I was going to post an image but I don't have enough reputation for it, so I guess the following illustration will have to do. Two branches continuously running with merges going both directions often. The key thing I am not sure about is how git will play out the commits and will it fill either branch with the commits from the other branch on merges or will it stay clean. I have used rebase before but it seems to end the branch and put all the commits into the master, or I did it wrong. Thanks for the help so far.</p> <pre><code>master A--B--C-----H--I--J--M--N \ / \ mobile \ / \ D--E--F--G--------K--L </code></pre>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USMartin Thoma
    1. USMr. EZEKIEL
    plurals
    1. This table or related slice is empty.
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow to keep a git branch in sync with master
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POHow to keep a git branch in sync with master
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow to keep a git branch in sync with master
      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