StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
primarykey
Id
18657782
data
AcceptedAnswerId
0
AnswerCount
0
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2013-09-06T12:21:43.923
FavoriteCount
0
LastActivityDate
2013-09-06T12:21:43.923
LastEditDate
LastEditorUserId
0
OwnerUserId
2609675
ParentId
18656548
PostTypeId
2
Score
1
ViewCount
0
LastEditorDisplayName
text
Body
The problem is that you used <code>git revert</code> instead of <code>git reset --HARD</code>. <code>git revert</code> creates a new commit that redoes the changes of the previous commit. <code>git reset</code> does the same, but not by creating a new commit, but by throwing away the faulty commit. Because of that the faulty commit still sits in your history. Merging 2 to HEAD doesnt work, because you are trying to merge with your own history. It is like trying to merge 4 into 2. What you need to do is, throw away 0 and make a new one. First, reset master back to 1 using: <pre><code>git reset --HARD 1 </code></pre> Then, reach a clean, merge-ready state there (you can do commits if you need to). After that, make sure branch-1 points to 2: <pre><code>git checkout branch-1 git reset --HARD 2 </code></pre> Reach a clean, merge-ready state there too. Then, merge them both: <pre><code>git checkout master git merge branch-1 </code></pre> Check the result of the merge. If it didnt work as you want, start over by reseting master and branch-1 again. If you can't get merge working, you might also try a rebase. This will flatten your history to a look like that: <pre><code>2' -- .. -- 4' -- 1 -- .. -- 3 -- 5 </code></pre> After you merged or rebased the two branches together, you may rebase any changes that were introduced after the reverted commit (Replace <code>2'</code> with the most current commit of the new merge/rebase you created, dont use HEAD as it will change once the command runs): <pre><code>git rebase 2' -2 </code></pre> After that, your history should look like that: <pre><code>-2' -- .. -- 2' -- .. -- 4' -- 1 -- .. -- 3 -- 5 </code></pre> Or, if you merged instead of rebase: <pre><code>-2' -- .. -- 0' -- 1 -- ... -- 3 -- 5 \ -- 2 -- ... -- 4 --/ </code></pre>
Tags
Title
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. POHow to fork two git branches around failed merge
 singulars
 PostTypePostTypeId
 PTQuestion
PostTypePostTypeId
1. PTAnswer
UserLastEditorUserId
1. This table or related slice is empty.
UserOwnerUserId
1. USOznerol256
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. POHow to fork two git branches around failed merge
 singulars
 PostTypePostTypeId
 PTQuestion
PostsParentIdCreationDate
1. This table or related slice is empty.
VotesPostIdCreationDate
1. VO
 singulars
 PostPostId
 PO
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
2. VO
 singulars
 PostPostId
 PO
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTAcceptedByOriginator
CommentsPostId
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.