Victor; can you please make sure to merge my branch into this one? Perhaps you did not see, but I had it ready to merge, having solved all conflicts, until you did all this work today, which... I now have to go back and resolve a bunch of conflicts.
Because of this too, you may have also done a bunch of work that was already done by myself.
Victor; can you please make sure to merge my branch into this one? Perhaps you did not see, but I had it ready to merge, having solved all conflicts, until you did all this work today, which... I now have to go back and resolve a bunch of conflicts.
Because of this too, you may have also done a bunch of work that was already done by myself.