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

PR batch 4 #1015

Closed
1 task done
nponeccop opened this issue Apr 12, 2023 · 4 comments
Closed
1 task done

PR batch 4 #1015

nponeccop opened this issue Apr 12, 2023 · 4 comments

Comments

@nponeccop
Copy link
Contributor

nponeccop commented Apr 12, 2023

Duplicates

  • I have searched the existing issues

Summary 💡

The new merging flow is getting traction.

Clean merge 🌈

Conflicts or Red CI from Batch 3:

Labeled

Motivation 🔦

We want to merge older PRs first, so that PR authors are motivated to fix conflicts once their PR gets into a batch. This happens when I, @nponeccop , approve the PR for the first time. I only check that there are no conflicts, CI is green and the PR only fixes one thing and cannot be sensibly split.

Then the PR gets an additional review from @Torantulino , @p-i- or @richbeales . Unlike my simple review, they review the logic extensively, and subsequently merge.

The merged commits are then tested at the end of the day, and merged into the stable branch. So people wanting to try Auto-GPT should try stable, not master. If master gets broken, we fix it by either accepting out-of-band PRs or fix it ourselves.

@nponeccop nponeccop mentioned this issue Apr 12, 2023
1 task
@EwoutH
Copy link

EwoutH commented Apr 13, 2023

Thanks for all this amazing work!

Would you consider using Squash and merge method for merging PRs instead of the "Create a merge commit" method? That will result in a way cleaner, and linear git log, since for each PR not multiple commits (including a merge commit) are included but only a single one.

Screenshot_847

@nponeccop
Copy link
Contributor Author

@EwoutH Propose in a separate issue, not here

@EwoutH
Copy link

EwoutH commented Apr 14, 2023

Done: #1255

@nponeccop
Copy link
Contributor Author

Today has been a challenging day. We began by merging issues as usual, but ultimately ended up addressing a long-awaited issue with our repository structure: the introduction of the autogpt module.

This change is significant and has impacted issues from Batch 5 and a few from Batch 4 that were still experiencing Git merge conflicts when we decided to move on. We followed the same carry-over procedure as we did with earlier batches.

In addition, we welcomed some new members to our development channels on Discord, including @0xArty , @BillSchumacher , and @merwanehamadi .

SquareandCompass pushed a commit to SquareandCompass/Auto-GPT that referenced this issue Oct 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants