git fetch -ap # get in sync w/ server
BRANCH_NAME=$(git symbolic-ref --short -q HEAD)
git checkout $BRANCH_NAME # switch to the appropriate branch
git reset --hard origin/$BRANCH_NAME # get my branch to be exactly the same as what's on the server
MERGE_BASE=$(git merge-base origin/$BRANCH_NAME origin/master) # get the commit where your branch originates
git reset --mixed $MERGE_BASE # reset to the point where your branch originates, but put your changes like you just made them
git add . # stage your changes for a new commit
# echo "Enter your commit message, followed by [ENTER]:"
# read MESSAGE
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2021-12-06 14:58:23.380144-0800 StartEngine[14604:3422025] [branch.io] BNCServerInterface.m(406) Debug: URL: https://api2.branch.io/v1/open. | |
2021-12-06 14:58:23.380239-0800 StartEngine[14604:3422025] [branch.io] BNCServerInterface.m(410) Debug: Body: { | |
"ad_tracking_enabled" = 0; | |
"app_version" = "1.3.4"; | |
"apple_ad_attribution_checked" = 0; | |
"apple_testflight" = 1; | |
"branch_key" = "key_test_gc2wCgw27X1fZRVcdU9tWmfkFqdM9X8J"; | |
brand = Apple; | |
build = 19B74; | |
cd = { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// | |
// BranchLinkRouter.swift | |
// StartEngine | |
// | |
// Created by Spencer Prescott on 8/19/21. | |
// | |
import SEUtility | |
import SEViewModel | |
import Branch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"mostMomentum": [ | |
{ | |
"id": "5ee25d98767263372266cad8", | |
"slug": "knightscope-1", | |
"name": "Hitmonlee Oscar llama", | |
"content": "I am downloading some NP# music.", | |
"categories": [ | |
{ | |
"id": "5540187f32303800032e0000", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
url: https://stg-gateway.startengine.com/user_svc/user/login | |
params: { | |
"username" : "[email protected]", | |
"password" : "Password11!" | |
} | |
### Backend sent down unstructured error response: 'org.springframework.dao.InvalidDataAccessResourceUsageException: could not execute statement; SQL [n/a]; nested exception is org.hibernate.exception.SQLGrammarException: could not execute statement | |
at org.springframework.orm.jpa.vendor.HibernateJpaDialect.convertHibernateAccessException(HibernateJpaDialect.java:281) | |
at org.springframework.orm.jpa.vendor.HibernateJpaDialect.translateExceptionIfPossible(HibernateJpaDialect.java:255) | |
at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.translateExceptionIfPossible(AbstractEntityManagerFactoryBean.java:528) | |
at org.springframework.dao.support.ChainedPersistenceExceptionTranslator.translateExceptionIfPossible(ChainedPersistenceExceptionTranslator.java:61) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<FAMOrderConfirmationConfig 0x7b28000231e0>: { | |
product_owner: "fair" | |
product_type: "core" | |
payment_breakdown { | |
vehicle_info { | |
make: "BMW" | |
model: "X3" | |
model_year: "2017" | |
trim: "xDrive28i" | |
body_style: "suv" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(lldb) po reply | |
<FAMAppModuleResponse 0x7b24000667b0>: { | |
session_token: "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJmYWlyX2FwaSIsInN1YiI6MTk4MzgwLCJzdXBwb3J0ZWRfYXBwX21vZHVsZXNfdmVyc2lvbiI6IjI2IiwiY3VycmVudF9hcHBfbW9kdWxlIjoxMX0.4qInRG77yUDkQgU3q3nhleqB6lGLG5QcMfLtqsbRPqc" | |
app_module: MARKETPLACE | |
app_module_config { | |
marketplace_config { | |
filter_config { | |
price_slider_default_max_cents { | |
cents: 100000 | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Status Code: 202 | |
URL: https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode | |
MIME: application/json | |
Content-Length: 1994 | |
Encoding: utf-8 | |
Filename: securitycode.json | |
Cache-Control: no-cache, no-store, no-store | |
Connection: keep-alive | |
Content-Encoding: gzip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Status Code: 200 | |
URL: https://idmsa.apple.com/appleauth/auth | |
MIME: application/json | |
Content-Length: 2127 | |
Encoding: utf-8 | |
Filename: auth.json | |
Cache-Control: no-cache, no-store, no-store | |
Connection: keep-alive | |
Content-Encoding: gzip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git log --since="20 days ago" --full-history --simplify-merges --author="cameron" --reverse --oneline > ~/Desktop/commits-for-invoice.txt |
NewerOlder