'How merge with master without conflict after rebase in feature branch?
I plan on creating a feature branch, and in addition to the new commits in the feature branch, I might also make file edits to an older commit in the feature branch through git rebase. Then I plan on merging the feature branch to the master branch.
I tested this scenario with a fake test repo, and I actually got a merge conflict with the rebased commit in the feature branch.
How can I avoid having this conflict at merge time?
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|