Request for adding a "one-shot" rebase strategy where conflicts are only resolved once

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Sometimes a clean merge is possible but with a rebase, in-between
commits may raise conflicts in which case a conflict must be resolved
for each commit individually, which is not quite productive and at the
end wouldn't add so much in how the resulting history looks like.

With a "one-shot" rebase, a conflict (if any) is made based on the
latest revision, then in-between commits approximated based on that
resolution. This way the history can be roughly preserved with the
same amount of effort while still using a rebase rather than merge.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux