Databases
StackOverflow2013
Postsdbo
POworkflow confusion after XCode git pull
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POworkflow confusion after XCode git pull
    primarykey
    data
    text
    <p>I've used other DVCS systems before but I'm new to git. So I think I have wrong assumptions about how to use it the way I intend.</p> <p>I have a RepoA which has a master and develop branch where I do the majority of my work. A while back, I cloned RepoB from RepoA to start working on "BigFeatureA" and also did this in the develop branch. I'm not finished with BigFeatureA but want to bring over all the changes that have been made in RepoA since I did the clone so that I continue to work on BigFeatureA using the most up to date code. (At the moment in RepoA, the develop and master branches are the same but of course, sometimes they're not.) Using XCode working in RepoB, I did a Pull from RepoA develop branch. I had a conflict, resolved it, Pull button enabled and then did the pull. </p> <p>Now in RepoB, all the changes brought over are "uncommitted changes" and the files are showing "M's" or modified. So none of the commit messages or anything came over from RepoA, just the source changes. This isn't what I expected. Is this just XCode's version of git workflow or is this just how git merge works?</p> <p>My final workflow was to push RepoB to RepoA when BigFeatureA was done. Is there a difference between doing that and going the other direction, ie: be in RepoA and pulling from RepoB?</p> <p>(Further reading suggests that I probably should have created a "BigFeatureA" branch in RepoB and then done a pull from RepoA on the develop branch in there and then a merge from the BigFeatureA branch into the develop branch. Would there have been a difference doing a merge between branches vs repo's?)</p>
    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. USmorejanus
    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. This table or related slice is empty.
    1. COdid you commit in repoA?
      singulars
      1. POworkflow confusion after XCode git pull
      1. USMichael
    2. COYes. There were a bunch of bug fixes done to RepoA that I wanted to bring over to RepoB - all committed.
      singulars
      1. POworkflow confusion after XCode git pull
      1. USmorejanus
 

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