Re: RFE #876613
"kaczoroj" <[email protected]>
| Newsgroups | gmane.comp.version-control.cvs.gui.devel |
|---|---|
| Message-ID | <[email protected]> |
Oliver, > Apart from the "Resolved" state I like this a lot. The latter we > discussed already and it seems my arguments weren't able to > convince you so I won't pursue this any further now... To be precise I used "Conflict" and "Conflict Res." in original CvsIn code. I decided to reduce that to simple "Resolved" to keep it short and easy to translate at the same time. This is just to reserve the description text for the state where there is a conflict and the file was touched. It doesn't neccesarily conflict with your other approach to allow users to "mark" files as "Resolving" but that is a topic that I will come back to when doing the actual resolved conflict state detection (which we will not have just yet). Best Regards, Jerzy Yahoo! Groups Links To visit your group on the web, go to: http://groups.yahoo.com/group/cvsgui-dev/ To unsubscribe from this group, send an email to: [email protected] Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/