[parfe]

How do you handle file locks? If A locks main.c and B pushes seven commits from his local repo with the oldest modifying main.c what is the end result?