ubuntu-git-tools | from robie

ubuntu-git-tools is a Shell library. ubuntu-git-tools has no bugs, it has no vulnerabilities, it has a Strong Copyleft License and it has low support. You can download it from GitHub.

from robie.basak@ubuntu.com mon aug 4 17:17:45 2014 date: mon, 4 aug 2014 17:17:45 +0100 from: robie basak robie.basak@ubuntu.com to: ubuntu-devel@lists.ubuntu.com subject: my git-based ubuntu package merge workflow message-id: 20140804161745.gf9731@mal.justgohome.co.uk mime-version: 1.0 content-type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="9l24nvcwtsuiviod" content-disposition: inline status: ro content-length: 19676 lines: 430. --9l24nvcwtsuiviod content-type: text/plain; charset=us-ascii content-disposition: inline content-transfer-encoding: quoted-printable. i thought it was about time that i shared my own merge workflow, as i think it is quite different from most other ubuntu developers. i'm an advanced git user (even a fanatic, perhaps), and i make extensive use of git's interactive rebase feature. to me, an ubuntu package merge is just a rebase in git's terminology, and in this case i use git as nothing more than an advanced patchset manager. i find my workflow allows me to handle arbitrarily complex package merges - something i've not been able to do any other way. and once i've merged a particular package with this workflow once, future merges take me far less time because checking individual broken down diffs is even quicker still. this workflow may be useful to others, but probably only if you are already