Code review comment for lp:~doxxx/qbzr/mergetools

Revision history for this message
Gary van der Merwe (garyvdm) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/11/2010 01:46, Gordon Tyler wrote:
>> I've fixed this and pushed to lp:~qbzr-dev/qbzr/mergetools. I've added you to
>> ~qbzr-dev, so if you want, you can also push there.
>
> Cool. Thanks. Can I just pull/push --remember to that with my current
> branch and continue working like that? And if I do, should I
> resubmit this merge proposal using the new branch?

Yes. Then it makes it easier for me to provide fixes.

>> I've been wanting to change qconficts to use the treewidget for a while. I'll
>> see if I can work on it shortly.
>
> You mean a treewidget to show the conflicts in the context of the working tree structure?

Yes - like qcommit/qrevet/qadd.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkzY+Q0ACgkQd/3EdwGKOh2qiQCgg+HP/oPNqu0UC/AkX1ULyqaq
9QYAniJ50ZS/Ak9Ie/iI+qig6zzWmcQN
=svmx
-----END PGP SIGNATURE-----

« Back to merge proposal