# resolves a tree conflict by accepting the "working" version,
# which effectively makes your current change the accepted one.
# resolves a tree conflict by accepting the "working" version,
# which effectively makes your current change the accepted one.