Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The best approach really depends on whether other people have remote copies of your code. If the <em>master</em> branch is only on your local machine, you can use the rebase command to interactively apply the commits from the feature branch into master:</p> <pre><code>git checkout master -b iphone-merge-branch git rebase -i iphone </code></pre> <p>Note that this alters the commit history of your new <em>iphone-merge-branch</em> branch, which may cause problems for anyone else trying to pull your changes into their checkout later on. By contrast, the merge command applies the changes as a new commit, which is safer when collaborating because it doesn't affect the branch history. See <a href="http://www.gitready.com/intermediate/2009/01/31/intro-to-rebase.html" rel="noreferrer">this article</a> for some useful tips on using rebase.</p> <p>If you need to keep your commit history in sync, you are better off performing a merge. You can use <em>git mergetool</em> to interactively fix conflicts one-by-one using a visual diff tool (a tutorial on this can be <a href="http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/" rel="noreferrer">found here</a>):</p> <pre><code>git checkout master -b iphone-merge-branch git merge iphone git mergetool -t kdiff3 </code></pre> <p>A third option, if you want absolute control over the process, would be to use <em>git cherry-pick</em>. You can use gitk (or your favourite history viewer) to view the commit hashes in the iphone branch, note them down, and cherry pick them individually into the merging branch - fixing conflicts as you go. An explanation of this process can be <a href="http://www.gitready.com/intermediate/2009/03/04/pick-out-individual-commits.html" rel="noreferrer">found here</a>. This process will be the slowest, but might be the best fall-back option if the other methods do not work out:</p> <pre><code>gitk iphone &lt;note down the 35 commit SHA hashes in this branch&gt; git checkout master -b iphone-merge-branch git cherry-pick b50788b git cherry-pick g614590 ... </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POgit: merge two branches: what direction?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USseanhodges
    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. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COWhat advantage would that rebase have over the merge? I don't quite understand. Why would the git rebase be more intelligent over the git merge? But anyway, rebasing here wouldn't be an option.
      singulars
      1. PO
      1. USAlbert
    2. CORebasing applies the commits individually into your branch in chronological order, this significantly reduces conflicts by inserting the commits at the point in history that they fit. Considering that rebasing is not an option for you, I suggest you investigate the git-mergetool approach.
      singulars
      1. PO
      1. USseanhodges
    3. COBut I could do the same also, merging each commit individually. What would be the difference to rebase then?
      singulars
      1. PO
      1. USAlbert
 

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