Differences between revisions 2 and 3
Revision 2 as of 2010-05-25 10:35:18
Size: 812
Editor: meebey
Revision 3 as of 2010-05-25 10:37:42
Size: 819
Editor: meebey
Deletions are marked like this. Additions are marked like this.
Line 22: Line 22:
 * {{{git merge -s recursive -X debian/patches/xxxx}}}  * {{{git merge -s recursive -X theirs debian/patches/xxxx}}}

I don't git it, but now you will

Debian patching workflow for new upstream versions

Update each patch branch

  • git checkout debian/patches/xxx

  • git merge upstream

  • Resolve possible conflicts
  • Repeat for all patch branches

Merge new upstream + updated patches + master (debian)

  • git checkout -b merge/$upstream_version upstream

  • git merge debian/patches/xxxx

    • Repeat for all patch branches
  • git merge -s recursive -X ours master

  • git checkout master

  • git merge merge/$upstream_version

Untested alternative merge workflow

  • git checkout master

  • git merge -s recursive -X theirs upstream

  • git merge -s recursive -X theirs debian/patches/xxxx

    • Repeat for all patch branches