i always work with branches. But sometimes, a particular changeset is in conflict with an another branch's changeset.
- Changeset 1 added new code
- changeset 2 from branch 2 is based on the old code. (more changeset in branch 2)
When I pull in changeset 2 it complains about conflict with changeset 1 which is already on master.
How can I fix changeset 2 such that when we accept PR or git rebase locally we don't have to go through manual fix?
git checkout commit-hash
fix commit
git commit
git rebase -i HEAD~2
now what? i have already pushed previous changes to my repo and there are many more changesets in the original branch (branch 2)