![]() ![]() ![]() Do not make it in two different commits in both branches, even if may be tempting as feature_a is part of the history of feature_b, having the single change in two different commits will be semantically wrong and possibly lead to conflicts or "resurrections" of unwanted code, later. Your feature_b is now a simple, standard branch going right from master.ĮDIT: inspired from the comments, a little heads up: if you need to make some change which affects both features, then be sure to make it in feature_a (and then rebase as shown). ![]() This final rebase will graft all commits that are dangling from the feature_acommit (which is now irrelevant as it has been merged into master) right onto master. Git rebase -onto master feature_a feature_b įinally, as soon as feature_a has been merged into master, you simply get the new master and rebase feature_aonto it a last time: git checkout master Whenever feature_a changes while it is waiting to get merged into master, you rebase feature_b on it. Start your feature_b from feature_a, i.e.: git checkout feature_a Rebasing has been mentioned in other answers, but only for rebasing things onto master. For this approach, you do not want to merge your feature_a into feature_b repeatedly. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |