I am trying to rebase mybranch with master and changes are a lot. I am getting so many merge conflict and have 20-30 number of commits. I even tried to squash all commits and rebase it but that also taking too much time. Is there any smart/easy way to do that.
Asked
Active
Viewed 11 times
0
Aditi Singh
- 92
- 7