Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Fix the commit history between forsetisecurity.org-dev & forsetisecurity.org #2119

Closed
joecheuk opened this issue Oct 19, 2018 · 4 comments
Closed

Fix the commit history between forsetisecurity.org-dev & forsetisecurity.org #2119

joecheuk opened this issue Oct 19, 2018 · 4 comments
Assignees
@joecheuk
Labels
module: website priority: p2 Important feature defect, moderate live issue

Comments

@joecheuk
Copy link
Contributor

joecheuk commented Oct 19, 2018 •
edited

The commit history diverged somehow between 2 branches and is creating some CLA problems every time we merge from forsetisecurity.org-dev to forsetisecurity.org.
@mirons-google
Copy link
Contributor

I would just add that we also need to ensure there are no CLA issues every time either.

@joecheuk
Copy link
Contributor Author

Description updated with CLA.

@ghost ghost added the triaged: yes label Oct 22, 2018
@ghost ghost assigned joecheuk Oct 22, 2018
@ghost ghost added module: website priority: p2 Important feature defect, moderate live issue labels Oct 22, 2018
@ghost
Copy link

ghost commented Oct 22, 2018

joecheuk to investigate.

@joecheuk
Copy link
Contributor Author

Since forsetisecurity.org-dev & forsetisecurity.org should be in sync, when we merge from dev -> non dev, we will need to use MERGE instead of SQUASH AND MERGE to avoid commit history conflicts. The website release steps have been updated to make it clear that only do MERGE.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joecheuk joecheuk

Labels
module: website priority: p2 Important feature defect, moderate live issue
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@joecheuk @mirons-google @forseti-security-waffle-bot