pombreda / nbgit

Automatically exported from code.google.com/p/nbgit
0 stars 0 forks source link

Error while Commiting After a Conflict #79

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
What steps will reproduce the problem?
1. Dev_1 push origin master [-->main.file with content on line 1]
2. Dev_2 push origin master [-->main.file with content on line 2 --> this will 
be rejected]
3. Dev_2 pull origin master [conflict line 1 for main.file solve it then commit]
4. Dev_2 Problem Here ngit cant commit cause of corrupt index...

What is the expected output? What do you see instead?
Error index is corrupt cant commit

What versions of NbGit, NetBeans and Java are you using?
On what operating system?
Version 0.4 for Netbeans 6.9 on Mac... and I cant use Custom Action if files 
are not commit...

Please provide any additional information below.

Original issue reported on code.google.com by kulahiTa...@gmail.com on 15 Jul 2010 at 4:12