StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POCreate tag and make local changes, then rebase against public branch
primarykey
Id
20529412
data
AcceptedAnswerId
20530832
AnswerCount
2
ClosedDate
CommentCount
4
CommunityOwnedDate
CreationDate
2013-12-11T20:37:06.717
FavoriteCount
0
LastActivityDate
2013-12-11T23:50:22.647
LastEditDate
2013-12-11T20:42:36.683
LastEditorUserId
88111
OwnerUserId
88111
ParentId
0
PostTypeId
1
Score
1
ViewCount
60
LastEditorDisplayName
text
Body
We have a situation in which (for this example) we have a straight line of development that is preparing for a release: <pre><code>A --> B --> C --> D ^ HEAD </code></pre> We decide that commits <code>C</code> and <code>D</code> are too forward-thinking, and we want to do the release from <code>B</code>. We have a tool that will go back and tag <code>B</code> as our release version, say <code>product-1.0.0</code>, and will then update a number of versioning files to <code>1.1.0</code>, or whatever version is next. The problem is the creation of the tag, and the tweaking of the files, is an atomic operation. We can change this, but it's a little bit more hassle. So while the tag needs to point at <code>B</code>, we want our file changes to be popped into a new commit. What we currently have: <pre><code> v detached, tagged, with local changes | A --> B --> C --> D ^ HEAD </code></pre> But, if we commit from our current point, we end up with: <pre><code> /--> E (a 'lost' commit) / A --> B --> C --> D ^ tag ^ HEAD </code></pre> What is the easiest way, either from the "detached with local changes" point, or from the "lost commit" point, to merge either our local changes, or our new commit, to the public branch so that it looks like: <pre><code>A --> B --> C --> D --> E ^ tag ^ NEW HEAD </code></pre> The commits <code>C</code> and <code>D</code>, as well as the entire branch, is public - so we can't really inject commit <code>E</code> between <code>B</code> and <code>C</code>. It's okay if those commits (<code>C</code> and <code>D</code>) exist as 'newer' <code>1.0.0</code> versions of the product we're releasing, we just want to create a new commit on top of the current <code>HEAD</code>. Is there a better way than stashing, checking out <code>HEAD</code>, then popping and committing?
Tags
<git><version-control><merge>
Title
Create tag and make local changes, then rebase against public branch
singulars
PostAcceptedAnswerId
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
PostParentId
1. This table or related slice is empty.
PostTypePostTypeId
1. PTQuestion
UserLastEditorUserId
1. USCraig Otis
UserOwnerUserId
1. USCraig Otis
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
2. PO
 singulars
 PostTypePostTypeId
 PTAnswer
VotesPostIdCreationDate
1. VO
 singulars
 PostPostId
 POCreate tag and make local changes, then rebase against public branch
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
CommentsPostId

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.