Comments (12)
I ended up creating a personal access token as described here: https://help.github.com/articles/accessing-github-using-two-factor-authentication/#using-two-factor-authentication-with-the-command-line. I have authenticated using it through the command line and Sublime Merge works like a charm now.
from sublime_merge.
Taking @FrankTheTank9's advice, I was able to finally resolve this.
- Created a personal token for the command line
- Updated my macOS keychain with the new personal token
- In Terminal, ran a git command, and it re-prompted for my credentials. I typed in my username and used my personal token as the password
Sublime Merge now works beautifully!
from sublime_merge.
Just tried to generate an access token as described by @FrankTheTank9, used it as the password when asked in Sublime Merge and that solved the problem.
from sublime_merge.
=== App Version Information ===
Build: 1119
=== Git Version Information ===
Using Git: git (system)
git version 2.17.2 (Apple Git-113)
PATH: /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/MacGPG2/bin (from shell)
environment variables loaded using: /bin/bash -l
This is an issue in the current version. I was able to get around this using the instructions for an access token, but ignoring native 2FA is not a great option in your build either. Especially when GitHub Desktop GUI prompts for the 2FA, which is what this program is designed in part to replace.
Is there any status updates on if or when this might be fixed or implemented?
from sublime_merge.
is there any status on when this would be fixed?
from sublime_merge.
I had the same problem recently. I was able to pull from GitHub with no problems and suddenly Merge is asking me for credentials. When I enter the right ones I get an “Invalid username or password” error. Then I disabled 2FA in GitHub and everything worked properly. Afterwards I enabled 2FA again and the problem reappeared in Merge.
from sublime_merge.
Why is this suddenly appearing if I never had any auth problems? Maybe a password cache issue? (I see there is an menu option for that which in my case is disabled).
from sublime_merge.
from sublime_merge.
from sublime_merge.
Instructions above worked – thanks!
Hoping to get this fixed as well, i.e. it'd be great if Sublime Merge integrated 2FA support or even linked to a page saying how to perform these steps.
from sublime_merge.
Hi all,
Thank you for sharing your concerns on this issue.
This is the official advice from GitHub: https://github.blog/2013-09-03-two-factor-authentication/#how-does-it-work-for-command-line-git
As Sublime Merge wraps around command line Git itself, its behavior should match the command line.
I'm going to go ahead and close this issue, but please feel free to re-open it if you feel it has not been addressed adequately.
Thanks,
- Dylan
from sublime_merge.
I ran into this problem on Windows with Sublime Merge and git bash. (In trying to fix it I had also installed Github Desktop as well, but I prefer Sublime Merge.)
While I followed the instructions and created a PAT, in the end I never needed to enter it anywhere. After creating the token, I ran git merge --rebase
from the git bash command line and the tool opened a github.com page in my browser. I confirmed that I wanted the github command line tool to have access to my github account and voilà, Sublime Merge now works without further login requests.
So If that's your setup, it may not actually be necessary to create a PAT, try just authenticating with the CLI first.
from sublime_merge.
Related Issues (20)
- Clone via SSH with Putty/plink for Windows on ARM fails to establish a connection HOT 1
- Commit operation is very slow compared with doing "git commit" HOT 2
- Add "pull --prune" option
- If user explicitly chooses Sublime Text.app as the Editor, files don't open
- Commit view looks broken on one repo HOT 1
- Diff not match git output HOT 1
- Push fails with 'command not found'
- LFS Label missing from files tracked in LFS with uppercase file extension HOT 1
- Summary stuck with submodule change
- Menu bar not working
- Sublime Merge reporting license is expired for a valid license
- Key Bindings for Merge Tool not working HOT 2
- enable color-coding or otherwise grouping of tabs HOT 1
- performance slow when using in a giant project with thousands of commiter and six years git commit history HOT 2
- Support for numbered/concatenated arguments and char escaping HOT 1
- Diff editing mode
- Navigate to commit not working with collapsed merge commits HOT 1
- Bug when selecting multiple commits HOT 1
- Named character classes not followed in ignore patterns HOT 1
- Random Staged Files displaying when working directory is clean HOT 3
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from sublime_merge.