StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POgit merge: Removing files I want to keep!
primarykey
Id
1407638
data
AcceptedAnswerId
1407694
AnswerCount
5
ClosedDate
CommentCount
1
CommunityOwnedDate
CreationDate
2009-09-10T20:47:54.690
FavoriteCount
13
LastActivityDate
2016-02-21T02:47:26.120
LastEditDate
2009-09-10T21:30:46.037
LastEditorUserId
10161
OwnerUserId
10161
ParentId
0
PostTypeId
1
Score
44
ViewCount
31687
LastEditorDisplayName
text
Body
How can you merge two branches in git, retaining necessary files from a branch? When merging two branches, if a file was deleted in one branch and not in another, the file is ultimately deleted. For example: <ul> <li>A file exists in master when you make a new branch</li> <li>you remove the file from master since we don't need it (yet)</li> <li>you make changes in the branch to add a feature, which relies on the file existing</li> <li>you make bug fixes in master (cannot be discarded)</li> <li>you merge some day, and the file is gone!</li> </ul> <hr> How to Reproduce: <ol> <li>Create a git repo with one file. <pre><code>git init echo "test" > test.txt git add . git commit -m "initial commit" </code></pre></li> <li>Create a branch <pre><code>git branch branchA </code></pre></li> <li>Delete the file in master <pre><code>git rm test.txt git commit -m "removed file from master" </code></pre></li> <li>Make ANY changes in branchA that don't touch the deleted file (it has to be unchanged to avoid Conflict) <pre><code>git checkout branchA touch something.txt git add . git commit -m "some branch changes" </code></pre></li> </ol> From here, any way I've found to merge these two branches, the test.txt file is deleted. Assuming we were relying on the file for <code>branchA</code>, this is a big problem. <hr> Failing examples: Merge 1 <pre><code>git checkout branchA git merge master ls test.txt </code></pre> Merge 2 <pre><code>git checkout master git merge branchA ls test.txt </code></pre> Rebase 1 <pre><code>git checkout branchA git rebase master ls test.txt </code></pre>
Tags
<git><merge><branch>
Title
git merge: Removing files I want to keep!
singulars
PostAcceptedAnswerId
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
PostParentId
1. This table or related slice is empty.
PostTypePostTypeId
1. PTQuestion
UserLastEditorUserId
1. USdrfloob
UserOwnerUserId
1. USdrfloob
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. PL
 singulars
 LinkTypeLinkTypeId
 LTLinked
2. PL
 singulars
 LinkTypeLinkTypeId
 LTLinked
3. PL
 singulars
 LinkTypeLinkTypeId
 LTLinked
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
2. PO
 singulars
 PostTypePostTypeId
 PTAnswer
3. PO
 singulars
 PostTypePostTypeId
 PTAnswer
VotesPostIdCreationDate
1. VO
 singulars
 PostPostId
 POgit merge: Removing files I want to keep!
 UserUserId
 USlas3rjock
 VoteTypeVoteTypeId
 VTFavorite
2. VO
 singulars
 PostPostId
 POgit merge: Removing files I want to keep!
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
3. VO
 singulars
 PostPostId
 POgit merge: Removing files I want to keep!
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
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.