I just did a plain git merge, since I actually wanted both branches to join.
Nicolas Le 28 oct. 2014 à 23:30, Jean-Louis Boudart <jeanlouis.boud...@gmail.com> a écrit : > Can you tell us the command you use ? > > Did you used squash option? Did you rebase ? > > 2014-10-28 22:55 GMT+01:00 Nicolas Lalevée <nicolas.lale...@hibnet.org>: > >> As you can see on the notifications list, there is a nice bunch of mails, >> all generated from my one commit which merged the master of Ivy into the >> branch 2.4. I have hard time understand the rationale. Anyone more familiar >> with git than me have some explanation ? >> >> Note that I am not worried, I just like to understand what is going on. >> >> Nicolas >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org >> For additional commands, e-mail: dev-h...@ant.apache.org >> >> > > > -- > Jean Louis Boudart > Independent consultant > Apache EasyAnt commiter http://ant.apache.org/easyant/ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
