Eclipse IDE

_commit

CVS: Conflicting changes cannot be committed. Either exclude them from the commit or use the synchronize view to resolve the conflicts.

CVS: Conflicting changes cannot be committed. Either exclude them from the commit or use the synchronize view to resolve the conflicts.


Imagine you are back from a half day from many nights working on codes, and the next morning you needed to check in your codes to your team. After some time has passed and your codes are still not fully committed yet, you sense some eyebrows raised, the room gets tensed, then every developer in your room “hears” you googling something, bang!


Eclipse reports two files which have conflicting changes that cannot be committed, you have resolved the conflicting codes, but Eclipse reports them still as conflicting changes. To make matters worse, the red icon flashes to you that there is no way you can bypass it, and you do not know what to do.


That happened to me this morning when while trying to synchronize my work with CVS. After making changes to ensure the conflicting changes were mirrored locally, the problem did not go away.


If you are like me – someone who has not used a CVS, then this could be a long haul issue to figure out. Luckily, my project manager was around and quick to point out / resolve immediately.

The long story short, after manually resolving conflicting changes (i.e. copy right to left), select “Mark as merged” from your Eclipse context menu. That afterwards should allow you to commit your files.

The problem


The solution


Aftermath

pp

Share
  • Newsflash

    March 2012: We have change our site theme to F2.
  • Who's Online

    5 visitors online now
    5 guests, 0 members
    Powered by Visitor Maps