Geert Janssens <[email protected]> writes: > For those curious to what happened here: > This (and the next) push are part of an experiment to reset the beta branch > to the current > master/trunk branch using git features. > > The following commands were executed: > 1. git checkout master > 2. git merge -s ours beta > (pushed the master branch to gitolite afterwards) > 3. git checkout beta > 4. git reset --hard master > (pushed beta branch afterwards
I was wondering why there were all these links to github (see below)! That just looked very odd to me. Also, it seems like we're not necessarily getting diffs to the gnucash-changes list for these merges. Is that something that can be fixed or does it not make sense? [snip] >> The master branch has been updated >> via https://github.com/Gnucash/gnucash-htdocs/commit/a2860322 >> (commit) via https://github.com/Gnucash/gnucash-htdocs/commit/08f4b14e >> (commit) via https://github.com/Gnucash/gnucash-htdocs/commit/3d5449be [snip] -derek -- Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory Member, MIT Student Information Processing Board (SIPB) URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH [email protected] PGP key available _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
