search

aidantwoods / SecureHeaders

A PHP library aiming to make the use of browser security features more accessible.
MIT License
421 stars 23 forks source link

2.0 #46

Closed aidantwoods closed 7 years ago

aidantwoods commented 7 years ago

PR for resolving conflicts in 2.0 branch prior to merge into master.

aidantwoods commented 7 years ago

Well... alright then.

screen shot 2017-07-15 at 02 09 44
aidantwoods commented 7 years ago

So looking at the point of divergence: (git merge-base master 2.0 => cd4210497d6949c5a3ce97c1fce78c3505986a5f)

https://github.com/aidantwoods/SecureHeaders/compare/cd4210497d6949c5a3ce97c1fce78c3505986a5f...master

screen shot 2017-07-15 at 02 35 46

Rebase is drawing up a lot of conflicts locally, especially in the SecureHeaders main class (even though that's not listed as conflicting above, guess GitHub only shows the first few files). No reason I can see that it should conflict either, so not sure if its a bug in git rebase.

Given this, and the fact that only thing worth keeping in master is the v1 documentation, I think it is best to just commit the v1 documentation directly to 2.0, and then rename 2.0 to master backtrack master to the point of divergence, so I avoid a risky rebase with lots of steps, during any of which I might break something.