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

[Agol.dk] Remove https rewrite #11210

Merged
merged 3 commits into from
Jul 21, 2017
Merged

[Agol.dk] Remove https rewrite #11210

merged 3 commits into from
Jul 21, 2017

Conversation

Bisaloo
Copy link
Collaborator

@Bisaloo Bisaloo commented Jul 18, 2017

@J0WI J0WI added the conflict label Jul 19, 2017
@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jul 21, 2017

This PR brings no relevant changes after merging but it still fixes ruleset style and remove the outdated comment.

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jul 21, 2017

@J0WI, FYI, we don't get notifications when you add tags. Conflicts would probably be solved faster if you could simply ping us as well.

@J0WI
Copy link
Contributor

J0WI commented Jul 21, 2017

Ok, I'll try to ping you in future. Btw: you should prefer rebaseing over merge commits in the case of a conflict.

@J0WI J0WI merged commit c1c0253 into EFForg:master Jul 21, 2017
@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jul 21, 2017

Btw: you should prefer rebaseing over merge commits in the case of a conflict.

Is there a technical reason for this? Or is it simply to avoid merge commits?

I usually work on Github for simple cases so I also solve conflicts via the web interface when possible. I only fetch, rebase and force push when it's too complicated.

@Bisaloo Bisaloo deleted the patch-58 branch July 21, 2017 13:37
@J0WI
Copy link
Contributor

J0WI commented Jul 21, 2017

It's simply to avoid merge commits, because they blow up the repo. But I'm not sure if this is still the case after I squashed your commits.

luciancor pushed a commit to luciancor/https-everywhere that referenced this pull request Aug 24, 2017
* [Agol.dk] Remove https rewrite

* [Agol.dk] Add subdomain
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants