DEV Community

Discussion on: Fed up with Git conflicts😤?: Rebase regularly and chill!

Collapse
 
maulik profile image
Maulik

Yujin, I currently use Bitbucket. It gives the option to rebase directly on PR diff view
Bitbucket

So it's a bit easy if we don't have any conflict but if there are conflicts then we have to manually rebase with the target branch as @cyberhck mentioned in his comment

Collapse
 
yujinyuz profile image
Yujin

Oh, cool! I didn't know Bitbucket has that feature.

I personally don't like bitbucket but thanks for sharing