Skip to main content
edited tags
Link
Patrick Kenny
  • 29.3k
  • 19
  • 139
  • 316
Source Link

What is the proper way to handle code conflicts between open issues on the same project page?

I'm fairly new to GitLab and git in general and I'm trying to learn the proper way to handle contributing to module issues in Drupal.

I have been working on these two issues: Third party settings are migrated to the state in a wrong way, Fix Scheduled Hour Time Zone Conversion.

I have a third issue, Add support for more schedule frequencies, that has some overlapping code and I need access to some functions that were defined in the other two issues. My first thought was to merge the branches from each issue into the branch for this issue and mark them as related issues. Is that the correct way to handle this, or should I be doing something else?