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
I am wondering what are the best practices for resolving merge conflicts. in my particular case I want to basically overwrite the destination branch with the files of my development branch. However, I am not able to do so because of merge conflict. basically there was another commit on the destination branch and that file is different that the baseline used in my development branch. I understand the reason why the merge conflict is highlighted but in this particular case I just want to overwrite that file with the one from my development branch without having to do any local changes. is there any way to achieve this?