- Country: Cyprus
Latest coverage
- Country: ME
,,MOĆNI SEKTOR BEZBJEDNOSTI”: Čast je čast, ali vlast je vlast!
,,Današnji dan poslao je sjajnu poruku: gradimo jak, moćan, otporan i profesionalan sektor bezbjednosti”. Tako je likovao Aleksa Bečić 2. oktobra, poslije državne svečanosti povodom Dana unutrašnjih poslova. Potpredsjednik Vlade za bezbjednost digao je u nebeske visine bezbjednosni sektor - koji on…
- Community aggregator
- Country: United States
I built a merge-conflict predictor that ignores lines and reads the AST instead
Git's idea of a merge conflict is narrower than it should be. Two branches change the same lines, you get a conflict. Two branches touch the same function from different files and never collide, git merges cleanly and congratulates you. Then production breaks. That's the merge I've learned to fear…