I have removed your merge from flourish branch.
# Your local branch will conflict. Push it aside # $ bzr branch . ../flourish-rejected # and get the real trunk # $ bzr pull --overwrite lp:schooltool.gradebook
« Back to merge proposal
I have removed your merge from flourish branch.
# Your local branch will conflict. Push it aside rejected
# $ bzr branch . ../flourish-
# and get the real trunk
# $ bzr pull --overwrite lp:schooltool.gradebook