... | @@ -39,3 +39,6 @@ and mainline's history will look like this: |
... | @@ -39,3 +39,6 @@ and mainline's history will look like this: |
|
A---B---C
|
|
A---B---C
|
|
|
|
|
|
```
|
|
```
|
|
|
|
The other take home message is that merge reverts are not the same as a commit revert.
|
|
|
|
A merge revert undoes the changes of the commits, not the commits. So the commits remain
|
|
|
|
and when you attempt to merge are assumed already done as the SHAs match. |
|
|
|
\ No newline at end of file |