Code review comment for lp://qastaging/~bryanfritt/compiz/compiz-decorator_script-edit_1192376

Revision history for this message
MC Return (mc-return) wrote :

> Is there a way/how to 'undo' a merge commit like 3752? Like if last merge were
> to prevent this branch from compiling, or something else?
>
"bzr revert" will revert uncommitted changes, use "bzr revert --help" for detailed
and verbose instructions on how to remove a commit.

> I'm guessing doing an unnecessary bzr merge or a bzr merge without a reason is
> a bad thing?

You just sync your source with trunk, nothing bad about doing this. It happens
anyway, when your branch lands. But doing it before it lands will give you the
opportunity to fix merge problems before they occur.

> I supose it would affect those downloading the branch, if they chose to try to
> compile it, etc..., but would it even matter to those evaluating the merge
> proposal in my case since it's the last thing done, and any of the files I
> changed, weren't changed by others?

I'm sorry, I do not understand what you mean by this...

« Back to merge proposal