Getting a merge conflict: 1 out of 1 hunks FAILED -- saving rejects to file ...
10 years, 8 months ago
(2013-08-12 17:33:16 UTC)
#2
Getting a merge conflict:
1 out of 1 hunks FAILED -- saving rejects to file
google-oauth-client-assembly/dependencies/google-oauth-client-java7-dependencies.html.rej
abort: patch failed to apply
Mind making sure it's updated to head?
Done. For whatever reason this command: hg rm google-oauth-client-assembly/dependencies/google-oauth-client-java7-dependencies.html causes the patch to fail. so ...
10 years, 8 months ago
(2013-08-12 18:22:25 UTC)
#3
Done. For whatever reason this command:
hg rm
google-oauth-client-assembly/dependencies/google-oauth-client-java7-dependencies.html
causes the patch to fail. so I'm reverting that particular removal from the
patch, but I will put it back in before committing.
Issue 12698045: oauth issue 86: Remove Beta API deprecated in 1.16 [backwards incompatible]
(Closed)
Created 10 years, 9 months ago by yanivi
Modified 10 years, 8 months ago
Reviewers: ngmiceli
Base URL: https://code.google.com/p/google-oauth-java-client/
Comments: 0