[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #12153 [Tor Support]: Chat window size is too small
#12153: Chat window size is too small
-----------------------------+----------------------------
Reporter: lunar | Owner: Sherief
Type: defect | Status: needs_revision
Priority: normal | Milestone:
Component: Tor Support | Version:
Resolution: | Keywords: pups
Actual Points: | Parent ID:
Points: |
-----------------------------+----------------------------
Comment (by lunar):
It's not ok as it still contains the commit you rewrote on the other
branch. That's why I said rebase instead of merge.
See by yourself:
{{{
$ git log --oneline origin/master..sherief/bug12153
be2c2aa Merge branch 'master' into bug12153
f35c9f6 Merge branch 'webchat_patches' into bug12153
ca6aad3 [#12153] Expands Webchat's chat window
dbd830e [#12626] Fixes multi-line support in webchat
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/12153#comment:5>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs