11. syntactic conflict
class BlaBlaBla {
<<<<<<< HEAD
public void bla(Bla oldBla, New newBla) {
oldBla.bla();
newBla.newBla();
=======
public void bla(Bla oldBla, Other otherBla) {
oldBla.bla();
otherBla.otherBla();
>>>>>>> other commit
}
}
12. semantic conflict
class BlaBlaBla {
public void something(Bla bla) {
<<<<<<< HEAD
bla = bla.plus(14);
=======
bla = bla.minus(7);
>>>>>>> change
//other stuff
}
}
23. “feature branching is a poor man's modular
architecture, instead of building systems
with the ability to easy swap in and out
features at runtime/deploytime they couple
themselves to the source control providing
this mechanism through manual merging”
Dan Bodart
