Community
Participate
Working Groups
Build Identifier: I20100429-1549 Preferences: Team -> CVS -> Prompting --> Commit resources with errors=Prompt If I try to commit a Project with conflicted resource, I get a dialog to confirm "One or more of hte files being committed contain errors. Do you want to proceed with the commit?". After click on "YES" the "Commit Files" dialog opens, but with error message "Conflicting changes cannot be committed. Either exclude them from the commit or use the synchronize view to resolve the conflicts." If I commit the conflicted resource itself it works but still I cannot commit the Project with commited conflicted resource. It seams to be as long you have a conflicted open merge result, you cannot commit the same project. Reproducible: Didn't try Steps to Reproduce: Maybe steps before are important: 1. Create Branch 2. Create Branch1 of Branch 3. Create Branch2 of Branch 4. work on Branch1 of Branch 4. work on Branch2 of Branch (one resource creates a conflict because of dependencies to other projects) 5. switch to Branch 6. Preview merge with Branch1 of Branch (maybe conflicts required) 7. overwrite all changes 8. immediately Preview merge with Branch2 of Branch (conflicts exist) 9. overwrite all changes 10.try to commit the changes on project level After sysnchronize the project the commit was possible with conflicted resource.
Re-assigning to Platform. Apologies if that's incorrect. -M.
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. As such, we're closing this bug. If you have further information on the current state of the bug, please add it and reopen this bug. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant. -- The automated Eclipse Genie.
