Avoid to detect a conflict when it's the same change

SeyZ / baboon

Detect source code merge conflicts in realtime. Simply get rid of merge hells.

http://baboon-project.org

120 stars 9 forks source link

Closed SeyZ closed 12 years ago

SeyZ commented 12 years ago

Avoid to detect a conflict when it's the same change. Verify that git/mercurial/svn/cvs/... don't detect a conflict in this case.

SeyZ commented 12 years ago

Git / Hg (and maybe svn, cvs, etc.) detect a conflict. It's not a problem.