gaia
gaia copied to clipboard
mozilla-b2g
Bug 943165 - [Messages] Bug 934531 follow-up: make the visual right for ...
D (Munto)
Something landed today in thread_ui_test.js and provoke a conflict.
Good, this is a good exercize ;) Here is how you can fix it:
git fetch upstream
git rebase upstream/master
here git tells you there is a conflict with test/unit/thread_ui_test.js. You need to fix it. You can easily find the conflict if you search for "<<<". You'll see the new code along with your code. Here is the issue is simply that one "4" was changed to "5". So you need to keep your code, just updating this "4" to "5", and remove the old code.
Change only what is needed to resolve the conflict, you can do other changes later.
When you're ready, type:
git add test/unit/thread_ui_test.js
git rebase --continue
Using "rebase", you changed history. Some guides will tell you this is wrong, but since we're not in a public place here, it's not really wrong. Once you changed history, git will forbid you from pushing to the same remote branch, unless you push using the -f option. So this time, you should push using -f.
Be careful to not take the habit to always use -f, you need to always think whether you need it or not. Git will always tell you if you should use it, and even in that case you need to think "oops, maybe I did a mistake" :)
Then you can fix the other changes I'll ask you, add them in a separate commit (so, don't use --amend), and push again to this PR. Using a separate commit makes it easier for me to look at your new changes.
Thanks !
Thank you for this nice guide! I took the initiative to add the font-weight after Fang's comment on bugzilla.
I hope this story of diples is not too annoying :/
https://bugzilla.mozilla.org/show_bug.cgi?id=1080828 will likely provoke a conflict too :/ you're not lucky here, this piece of code was not changed for several months !