I'd suggest having two installations of E@syfile, one for each branch (probably need to have them on separate machines).

Then backup the one db and use E@syfile's database merge facility on the other install to import that db.