You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
Hey @Vinayakam R K
In order to do smart merges, git looks on previous commits to understand which changes to choose from each branch. Without a common ancestor, git won't have a starting point for the merge and won't be to update the commit tree correctly.
You can try solving this issue using git cherry-pick the selected commits or git show and git apply to apply the code changes without updating the commit tree.