Merge upstream with ease!
Flaura implements all the merging behaviors of Git, and not only that, it's Git-ndependent, or standalone, which makes merging a non-Git folder, or just a certain folder in a Git repository, instead of the whole repository.
It allows hardforking to be like a charm!!
At the moment, Flaura is still in early development.