Pinned Loading

1. Divergent Branches: What to do when ... Divergent Branches: What to do when git cannot pull

   1

   # Divergent Branches: What to do when `git` cannot pull

   2

   Suppose you are pulling from your remote repository, and `git` refuses to cooperate because you have divergent branches:

   3

   4

   ```console

   5

   chris@raspberrypi:~/Documents/Repositories/org $ git pull origin main

2. Divergent branches: Resolving via `g... Divergent branches: Resolving via `git merge`

   1

   # Divergent branches: Resolving via `git merge`

   2

   3

   If the main branch of a remote git repository (origin) has new commits, but there are no commits to the main branch of the local repository, Git will allow you to fast-forward your local branch to catch up to origin with `git pull origin main`. 

   4

   5

   Conversely, if the main branch of the local repository changes (in the form of one or more commits), but there are no commits to main branch of origin, then `git push origin main` will push the local commits to main branch of origin.

3. Water cooler discussion regarding th... Water cooler discussion regarding the Washington Bridge

   1

   # Water cooler discussion regarding the Washington Bridge

   2

   3

   Having read numerous articles regarding the failed pin connection of the Washington Bridge, I am writing with the hope that this letter might encourage a public-facing conversation amongst the general public as well as individuals directly involved in the matter. My perspective is based on my direct experience working in the bridge office at the Rhode Island Department of Transportation (RIDOT) from 2012 to 2023 [^1]. Such a conversation might allow for a better understanding of what happened and what may be done going forward.

   4

   5

   Although Max Wistow, who has been hired to lead the RIDOT legal effort, has declared "open season" with regard to who the investigation may potentially target, and has indicated that "... the chips will fall where they may," it should be noted that both their ability to win a legal case and the total amount of money that they earn will depend on who they decide to target[^2]. In order to get paid, they must win, and the forensic analysis team is working in coordination with that explicitly stated motivation[^3]. The state cannot, by any stretch of the imagination, seek financial reimbursement from itself, and so the entire effort appears to be predicated on the assumption that both RIDOT and FHWA are not liable. Although this may turn out to be an assumption that is true, it should lead to further discussion with regard to the adoption of responsibility within state and federal agencies. If state and federal agencies are presumed to be free of liability, what is the appropriate amount of decision making authority they should possess?