DEV Community

loading...

Discussion on: How to use git efficiently

Collapse
jnareb profile image
Jakub Narębski

There is another method for developer to resolve conflicts, namely rebase his or her changes on top of the current state of main line of development (with interactive rebase the developer would also be able to clean up history to make for easier review). When doing a pull request from rebased branch, it should be able to be merged cleanly.

Collapse
adityasridhar profile image
Aditya Sridhar Author

Yup. I Have written about rebase in this article
adityasridhar.com/posts/how-to-bec...

Will soon post it in dev.to as well