D21156: Fix browse mode not disabled after Ctrl is released
René J.V. Bertin
noreply at phabricator.kde.org
Wed Jun 26 12:17:03 BST 2019
rjvbb added a comment.
> > I suggest to do a `arc amend` (to basically update the commit message with current reviewers, "Differentiatl Revision" line, etc.) and then `git push` your change manually to the right branch. Let's you use your normal git command-line to actually push changes, which to me is a much more thrust-worthy approach than to rely on arc to do that for me...
> Probably this should be added to the guide. And probably it should also be added that the commits should be squashed (thing that `arc land` does automatically).
The problem with that is that you already pushed, so you'd have to force-push, and everyone who has already pulled your original commit will have to force-pull. A `git amend` will in fact rewrite the history and change the commit hash (but the original hash continues to exist). Unless I'm doing something wrong, which isn't impossible at all.
> Good to know. I prefer this approach, seems way easier and less error prone than cherry pick, squash, arc amend and push.
I only use arc to upload to phab, and sometimes to fetch a patch file. For the rest I prefer to do things manually. Git is voodoo enough on its own, no need to add additional complexity written in some obscure-to-me scripting language :)
To: simgunz, #kdevelop, rjvbb, mwolff
Cc: kossebau, kfunk, aacid, kde-doc-english, mwolff, rjvbb, kdevelop-devel, hmitonneau, christiant, gennad, fbampaloukas, glebaccon, domson, antismap, iodelay, alexeymin, skadinna, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the KDevelop-devel