[dev] [commits] Horde branch ingo_3_1 created. 7da0a9f68facafba37d8c5beebc3831ae3ec5829

[Ralf Lang]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 21.12.2012 11:15, schrieb Jan Schneider:
> 
> Zitat von Michael M Slusarz <slusarz at horde.org>:
> 
>> The branch "ingo_3_1" has been created. at
>> 7da0a9f68facafba37d8c5beebc3831ae3ec5829 (commit)
>> 
>> -----------------------------------------------------------------------
>>
>> 
commit 7da0a9f68facafba37d8c5beebc3831ae3ec5829
>> Author: Michael M Slusarz <slusarz at horde.org> Date:   Mon Nov 12
>> 23:44:48 2012 -0700
>> 
>> [mms] All Ingo templates now use Horde_View.
>> 
>> Conflicts: ingo/docs/CHANGES ingo/package.xml
> 
> I already created an ingo_3_1 branch locally that wasn't ready for 
> origin yet. Any idea how to best merge these two into a single
> branch that tracks origin/ingo_3_1?

When polishing internal patch branches for upstream projects, we
usually git rebase --interactive and squash commits to get clean
separate issue commits and then either cherry-pick these into a
prepared up to date branch or generate patches and apply the separate
patches to the branch.

If this all doesn't work, we just redo the changes manually, separated
by issue to generate a clean commit history.


- -- 
Ralf Lang
Linux Consultant / Developer
Tel.: +49-170-6381563
Mail: lang at b1-systems.de
B1 Systems GmbH
Osterfeldstraße 7 / 85088 Vohburg / http://www.b1-systems.de
GF: Ralph Dehner / Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlDUSCYACgkQCs1dsHJ/X7DYTQCgiGEfXn1cu9OVBO6EFb2frxFw
pooAoNLLYZh3sSmJ+Vs8kv2ef/4ztZqj
=hhj9
-----END PGP SIGNATURE-----