View Single Post
Old 09-05-2014, 03:52 PM   #8
eschwartz
Ex-Helpdesk Junkie
eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.eschwartz ought to be getting tired of karma fortunes by now.
 
eschwartz's Avatar
 
Posts: 19,421
Karma: 85400180
Join Date: Nov 2012
Location: The Beaten Path, USA, Roundworld, This Side of Infinity
Device: Kindle Touch fw5.3.7 (Wifi only)
Quote:
Originally Posted by JSWolf View Post
The problem with doing this via the code is that you'll have to do it every single time you update Calibre.
Wrong. Steps are as follows:
  1. Make changes.
  2. committing the change tracks it to preserve even after downloading other peoples' changes.
    Code:
    git commit --all --message="my changes/commit message"
  3. In future, update the source checkout with the rebase switch:
    Code:
    git pull --rebase

Either way, you'd have to pull the changes. Rebasing them preserves local commits, which is nicer than seeing a merge conflict. (Instant panic while people new to version control wonder what to do.)

@JSWolf, have you used version control before?
If not, remember that assumptions are not always wise.
If yes, why not give a fair explanation, rather than oversimplifying? How are people supposed to learn?


There are better reasons not to use the code... like using firewalls for what they are meant for.

Last edited by eschwartz; 09-05-2014 at 05:04 PM.
eschwartz is offline   Reply With Quote