KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
Lets say we have two branches ( B and C ) that have diverged from a common ancestor A . Will merging from B to C produce the same result as merging from C to B ? A | / \ B C To clarify- I'm assuming that any manual merge conflict resolutions will occur in both directions. But will any automatic merges that occur result in the same code being chosen? This is what I'm assuming, since the commit dates are identical in both directions. To further clarify - I know that the actual merging results in "mirror images" of each other based on the direction. I'm just asking about the automatically resolved conflicts.
Tags (comma-separated)
Save Edits
Cancel