Author Topic: git workflow  (Read 622 times)

coley

  • Guru
  • ****
  • Posts: 492
    • View Profile
git workflow
« on: May 12, 2016, 07:28:13 pm »
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.

posde

  • Administrator
  • LinuxMCE God
  • *****
  • Posts: 3408
  • Wastes Life On LinuxMCE Since 2007
    • View Profile
    • My Home
Re: git workflow
« Reply #1 on: May 12, 2016, 07:44:16 pm »
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

  • Guru
  • ****
  • Posts: 492
    • View Profile
Re: git workflow
« Reply #2 on: May 12, 2016, 07:57:16 pm »
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.

posde

  • Administrator
  • LinuxMCE God
  • *****
  • Posts: 3408
  • Wastes Life On LinuxMCE Since 2007
    • View Profile
    • My Home
Re: git workflow
« Reply #3 on: May 12, 2016, 08:26:44 pm »
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

  • LinuxMCE God
  • ****
  • Posts: 1544
    • View Profile
Re: git workflow
« Reply #4 on: May 12, 2016, 10:16:15 pm »
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

  • Guru
  • ****
  • Posts: 492
    • View Profile
Re: git workflow
« Reply #5 on: May 13, 2016, 01:09:59 am »
ok, thanks can do.

-Coley