git workflow

[coley]

Is there a specified git workflow for the new linuxmce repo?
I see some commits are done on iss<nnnn> branches and others are done directly on master.
I was going to make a tiny change and wanted to know the right way to approach it.

thanks,
-Coley.

[Marie.O]

The branch to iss<number of ticket this is about> is the preferred way of doing things.

Some old farts can't get rid of the way they've used the other SCM for so many years.

[coley]

once I have an ssh key in place can I push my branch?
who does the merge to master? or dev branch (although I don't see those either )

Thanks,
-Coley.

[Marie.O]

The idea is, that you branch off into iss<nnnn>, and after you have committed your stuff into your branch, ask someone in -devel to merge it into master.

[phenigma]

Gitlab has a great built-in merge request feature in the web interface.  Feel free to create a merge request there, from your branch, and ask someone to check/merge it

J.

[coley]

ok, thanks can do.

-Coley