Menu
Is there any way to perform a merge with subversion 1.6 which would preserve the branch's history?
trunk: r1 --> r2 --------------> r5 branch: \--> r3 --> r4 / such as that when I merge at r4 the history will contain r3 and r4? At the moment subversion will record one merge commit with the diff between r4 and r2.
778
In the Conceptual Overview section, we saw how a feature branch can incorporate upstream changes from main using either git merge or git rebase . Merging is a safe option that preserves the entire history of your repository, while rebasing creates a linear history by moving your feature branch onto the tip of main .
Merging Branches. Once you've completed work on your branch, it is time to merge it into the main branch. Merging takes your branch changes and implements them into the main branch. Depending on the commit history, Git performs merges two ways: fast-forward and three-way merge.
A merge takes two or more branches, and creates a commit that interleaves the changes in all parents (resolving conflicts, as needed; the user has to decide how). git does not change history by itself.
What does it mean to preserve branch's history? If you want svn log and svn blame to see through merges, use option --use-merge-history or -g.
72
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
