Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop-Test & Develop-Main Conflict Fix #498

Closed
wants to merge 41 commits into from

Conversation

tsuchiyama-araya
Copy link
Collaborator

Develop-Test & Develop-Main Conflict Fix

行った作業
・develop-test から別branch派生 → conflict修正 → develop-test へ PR merge

ReiHashimoto and others added 30 commits December 21, 2023 15:18
…low-uid

Refactor logic of creating workflow unique_id
@itutu-tienday
Copy link
Collaborator

  • 質問
    • このPRでは、rbase? が行われている事由はなにか?
      • このPRは、もともと数ファイルのみのconfictへの対応のため、単にconflict修正のcommitが含まれた、簡潔なPRになるのではないか。
      • またどの時点からのrebaseであるか? (2023年のcommit logがmerge対象に含まれているのはなぜか?)

行った作業
・develop-test から別branch派生 → conflict修正 → develop-test へ PR merge

正確な実施作業手順を示していただけるとよさそうです

@itutu-tienday
Copy link
Collaborator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants