How do I actually deal with conflicts when using Git rebase?
I’m working on a team project where the Git strategy is to do development on a dedicated branch (one branch per feature or bugfix), and regularly rebase master on this branch.
I’m working on a team project where the Git strategy is to do development on a dedicated branch (one branch per feature or bugfix), and regularly rebase master on this branch.