[Pkg-ime-devel] ibus-chewing_1.4.7-2_amd64.changes REJECTED -> source?

[ChangZhuo Chen (陳昌倬)]

On Sat, Jan 25, 2014 at 03:45:37PM +0900, Osamu Aoki wrote:
> Wait a moment.  Did you really used git-import-orig?  It should merge
> for you as I understand.  It looks like you simply imported source to
> upstream branch using "git add -A ." + "git checkin".

I think I used a wrong way to handle conflict. Sorry about that.
> 
> Have you used "gitk --all" to inspect how things work?  That should make
> situation clear when working with git.

Thank for the advice. I will use it next time.

-- 
ChangZhuo Chen (陳昌倬) <czchen at gmail.com>
Key fingerprint = EC9F 905D 866D BE46 A896  C827 BE0C 9242 03F4 552D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-ime-devel/attachments/20140125/a0ddf5d5/attachment.sig>