| Re: [4diac-dev] Suggestion of using git-flow like workflow for development |
Hi,
I prepared a first draft of what might be a git cheat sheet with some introduction to the workflow. The idea is to have all the important and most used information about git in one simple file, instead of going through pages and pages of tutorials. I leave it in txt so you can edit it (specially the push and fetch, which I’m not so sure about). I know that it’s not a good idea to make file revision through email, but at least to have some opinions and the group moving. If the document goes well, it can be added to the documentation of the git project.
Regards,
Jose Cabral
--
fortiss · An-Institut Technische Universität München
Guerickestraße 25
80805 München
Germany
Tel.: +49 (89) 3603522 0
Fax: +49 (89) 3603522 50
E-Mail: cabral@xxxxxxxxxxx
Amtsgericht München: HRB: 176633
USt-IdNr.: DE263907002, Steuer-Nr.: 143/237/25900
Rechtsform: gemeinnützige GmbH
Sitz der Gesellschaft: München
Geschäftsführer: Prof. Dr. Helmut Krcmar, Thomas Vallon
Vorsitzender des Aufsichtsrats: Dr. Ronald Mertz
Von: 4diac-dev-bounces@xxxxxxxxxxx [mailto:4diac-dev-bounces@xxxxxxxxxxx] Im Auftrag von Gerhard Ebenhofer
Gesendet: Montag, 14. März 2016 07:06
An: 4diac developer discussions <4diac-dev@xxxxxxxxxxx>
Betreff: Re: [4diac-dev] Suggestion of using git-flow like workflow for development
Hi,
from my point of view it seems to be a good "workflow". As I'm currently not that familiar with the git commands (especially with advanced options like "--no-ff" as mentioned in the articles you linked) - it might be useful to have something like a "cheat-sheet" with the main git commands (and the corresponding UI functionalities in EGit) to be used in the 4DIAC-git-flow workflow.
Do you think it is possible and usefull that we make a "4DIAC - git-flow workflow" cheat sheet?
Regards,
Gerhard
On Fri, Mar 4, 2016 at 2:41 PM, Alois Z. <alois.zoitl@xxxxxx> wrote:
Hi,
After reading more on git and how to use it I would like to propose a git-flow like workflow [1] to be used for our developments in 4DIAC.
The key point is to use master only for releases and a seperate development branch for the main development. The rest is rather similar how we did it with hg. The reason I'm saying git flow like workflow is that thre is currently no fully functional Eclipse plugin for git-flow and I would strongly recomend to use EGit with Mylin connected to our bugzilla for commiting in 4DIAC.
However the most important steps are very good described in this [2] blog post.
What do you think?
Cheers,
Alois
_______________________________________________
4diac-dev mailing list
4diac-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/4diac-dev
--