Git: fix noobish mistake to avoid rebase hell

Question

I'm a bit new with git, and decided that I would jump right into it rather than giving myself a proper tutorial. After a month of working on a project, I've gotten myself into a little trouble. I decided at one point in time that I didn't like how a particular piece of code was turning out, so at that point, B, I branched to E, deleted the offending file, and recreated it as a whole new file. Obviously the best thing to do would have been to git rm instead of just deleting the file... I now need to rebase E to branch off of C, but am not sure how to manage that, because of conflicts with the rebase, since the file changes in both branches. My goal is basically to have the branch starting at E continue with the new file, but to incorporate the changes of C into the new branch. Any help in figuring out how to manage rebasing this, would be greatly appreciated.

A -> B -> C -> D
     \
       E -> F -> G

Community · Accepted Answer · 2017-05-23 12:06:47Z

2

Your concluding statement tells me that what you are looking for is to merge the specific file in C or even better in D with the same file in G. This way you will have the new file as it has progressed from E to G including the changes you made in C which I presume are also in D.

Merging specific files between branches is possible. As I am not very experienced doing this I will refer you to a couple of links that describe how you can do it:

http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/

How do I merge changes to a single file, rather than merging commits?

I hope this helps.

edited May 23, 2017 at 12:06

CommunityBot

11 silver badge

answered Nov 8, 2012 at 16:32

amavroudakis

2,36217 silver badges25 bronze badges

Sign up to request clarification or add additional context in comments.

1 Comment

Adam Feldman Over a year ago

Seems a little kludgy to just checkout files but since I couldn't come up with a better option, that's what I went with (the jasonrudolph link). Thanks for the reference.

Collectives™ on Stack Overflow

Git: fix noobish mistake to avoid rebase hell

1 Answer 1

1 Comment

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

1 Comment

Your Answer

Sign up or log in

Post as a guest

Linked

Related