privacyguides
/
privacytools.io
Archived
1
0
Fork 0
Code Issues 304 Pull Requests 47 Activity

Merge remote-tracking branch 'refs/remotes/privacytoolsIO/master' #228

Closed
LizMcIntyre wants to merge 1 commits from master into master
pull from: master
merge into: privacyguides:master
Conversation 5 Commits 1 Files Changed -
LizMcIntyre commented 2017-06-06 02:59:26 +00:00 (Migrated from github.com)
Copy Link

Changed color of Bitcoin "Accepted" for StartMail from blue to green.

Changed color of Bitcoin "Accepted" for StartMail from blue to green.
Nightfirecat commented 2017-06-06 03:09:27 +00:00 (Migrated from github.com)
Copy Link

It looks like you've lost your actual changes when trying to do a local merge...

I'd advise re-attempting your changes as follows:

git checkout master
git pull # update with latest changes
git checkout -b startmail-bitcoin-color-change # create a fresh branch to work on
# make your changes
git add index.html
git commit
git push

Once you're done with that, you can open your PR from that startmail-bitcoin-color-change branch.

It looks like [you've lost your actual changes](https://github.com/privacytoolsIO/privacytools.io/pull/228/files) when trying to do a local merge... I'd advise re-attempting your changes as follows: ``` git checkout master git pull # update with latest changes git checkout -b startmail-bitcoin-color-change # create a fresh branch to work on # make your changes git add index.html git commit git push ``` Once you're done with that, you can open your PR from that `startmail-bitcoin-color-change` branch.
LizMcIntyre commented 2017-06-06 03:29:04 +00:00 (Migrated from github.com)
Copy Link

Thanks. I'll try again.

Thanks. I'll try again.
LizMcIntyre commented 2017-06-06 04:10:32 +00:00 (Migrated from github.com)
Copy Link

See pull request #229. This replaces failed pull request #228.

See pull request #229. This replaces failed pull request #228.
Nightfirecat commented 2017-06-06 04:25:00 +00:00 (Migrated from github.com)
Copy Link

Looks good! You should be safe to close this PR now.

Looks good! You should be safe to close this PR now.
LizMcIntyre commented 2017-06-06 04:53:22 +00:00 (Migrated from github.com)
Copy Link

Thanks!

Thanks!
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
Labels
Clear labels   
🔍🤖 Search Engines

   
approved

approved, waiting for a PR

  
dependencies

Pull requests that update a dependency file

  
duplicate

   
feedback wanted

   
high priority

   
I2P

The Invisible Internet Project (I2P)

  
iOS

   
low priority

   
OS

Operating Systems

  
Self-contained networks

   
Social media

   
stale

A label for stalebot if it gets added

  
streaming

Anything related to media streaming.

  
todo

   
Tor

Anything covering the Tor network

  
WIP

active work in progress, do not merge or PR (yet)!

  
wontfix

Issues or bugs that will not be fixed and/or do not have significant impact on the project.

  
XMPP

Extensible Messaging and Presence Protocol

  
[m]

Matrix protocol

  
₿ cryptocurrency

   
ℹ️ help wanted

   
↔️ file sharing

   
⚙️ web extensions

Browser Extension related issues

  
✨ enhancement

   
❌ software removal

   
💬 discussion

   
🤖 Android

   
🐛 bug

   
💢 conflicting

   
📝 correction

Correction of content on the website

  
🆘 critical

   
📧 email

   
🔒 file encryption

   
📁 file storage

   
🦊 Firefox

Firefox & forks, about:config etc.

  
💻 hardware

   
🌐 hosting

   
🏠 housekeeping

Anything primarily related to site cleanup.

  
🔐 password managers

   
🧰 productivity tools

   
🔎 research required

   
🌐 Social News Aggregators

   
🆕 software suggestion

   
👥 team chat

   
🔒 VPN

Virtual Private Network

  
🌐 website issue

*Technical* issues with the website.

  
🚫 Windows

   
👁️ browsers

   
🖊️ digital notebooks

   
🗄️ DNS

Domain Name System

  
🗨️ instant messaging (im)

   
🇦🇶 translations

Anything covering a translated version of the site

No Label
🔍🤖 Search Engines
approved
dependencies
duplicate
feedback wanted
high priority
I2P
iOS
low priority
OS
Self-contained networks
Social media
stale
streaming
todo
Tor
WIP
wontfix
XMPP
[m]
₿ cryptocurrency
ℹ️ help wanted
↔️ file sharing
⚙️ web extensions
✨ enhancement
❌ software removal
💬 discussion
🤖 Android
🐛 bug
💢 conflicting
📝 correction
🆘 critical
📧 email
🔒 file encryption
📁 file storage
🦊 Firefox
💻 hardware
🌐 hosting
🏠 housekeeping
🔐 password managers
🧰 productivity tools
🔎 research required
🌐 Social News Aggregators
🆕 software suggestion
👥 team chat
🔒 VPN
🌐 website issue
🚫 Windows
👁️ browsers
🖊️ digital notebooks
🗄️ DNS
🗨️ instant messaging (im)
🇦🇶 translations
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: privacyguides/privacytools.io#228
No description provided.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?