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

Add Docteur Gab's with test #280

Closed
wants to merge 4 commits into from

Conversation

AllemanoEn
Copy link
Contributor

Closes #279

@wasadigi
Copy link
Member

wasadigi commented Mar 1, 2021

Can you please submit 1 PR for every beer? Here, I have both beers (you probably did not move back to master branch before creating the Dr Gabs branch). Thanks!

@wasadigi
Copy link
Member

wasadigi commented Mar 2, 2021

Let's look carefully. If we look at the number of modified files, we see 2 so that looks promising. However, if we look closely at the commits, we see that PrixGarantie files have been removed (they were there, because this branch was created of PrixGarantie). So if I merge, PrixGarantie will disappear from the codebase. I see 2 options, one safe and one that requires more care. Safe: create a new branch from master, get the DrGabs files (use git checkout -- for that) and submit a new PR. Rewrite the history of this branch (which after you use the correct git commands will require you to do a force push). But I advise to use force push only if you know very well what you are doing.

@AllemanoEn
Copy link
Contributor Author

Should I close this PR and delete my fb-dg ?

@wasadigi
Copy link
Member

wasadigi commented Mar 2, 2021

Yes, I think it's better.

@AllemanoEn AllemanoEn closed this Mar 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add the beer : Docteur Gabs + tests
2 participants