In my git workflow i have to merge a feature branch into master.
However while i am resolving merge conflicts, somebody has pushed a new commit to feature and master.
I have then to generate a new merge commit, based on new feature and new master. However 90 % of the merge conflicts are still the same.
So my question is. Can i save my progress from the first merge, and apply it in the conflict phase of the new merge ?
+--------+ +--------+ +------------+
| | | | | |
| init +------> | master +-----------> | new master |
| | | | | |
+--------+ +--------+ +------------+
| | |
| +---------+ +-------------+
| | | | |
+---------> | feature +----------> | new feature |
| | | |
+---------+ +-------------+
| | ||
| | ||
| | +----------------+ || +-----------+
| +----> | | +---------> |
| | first merge | | | new merge |
+-----------> | +---------> |
+----------------+ +-----------+