Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-dev] Merge conflicts in git

Hey gang,

 

I tested out trying to resolve a merge conflict with the latest egit. I’m a bit confused about the UI. Any advice on the best approach?

 

Thanks,

Doug.


Back to the top