Re: Re: [Internet]Re: [PATCH v5] merge: avoid write merge state when unable to write index

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

 



> [2] From a usability perspective, the merge state should not be written when the index is being
> written (merge conflicts are not considered failures). To avoid losing changes in the source branch,

"the merge state should not be written when the index is being written" should be:
the merge state should not be written if the index write fails.



> users can only execute 'git merge --abort' and try 'git merge' again. However, if the merge state is
> not written in the first place, the user only needs to retry 'git merge'.


>In other words, writing the merge state after the index write fails is meaningless and could
>potentially cause Git to lose changes.






[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