Quantcast
Channel: Mendix Forum Questions
Viewing all articles
Browse latest Browse all 80876

Cannot resolve conflict because of editing the CSS by two different developers

$
0
0

I can't resolve the conflict because me and a fellow developer have both made changes on the CSS file on our computer, before trying to commit it to the Team Server. 


Viewing all articles
Browse latest Browse all 80876

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>