gilstrac

U.S. Parents Are Sweating And Hustling To Pay For Child Care : NPR : I have a witnessed this first hand with my children.  We have an 11-year gap between the two oldest and the youngest child.  We pay a bit more for one child in preschool than we did for two 11 years earlier.  It works out to about 9k for 4 days a week of preschool.

Parents express concern for their children in light of police brutality | New Pittsburgh Courier : I sympathize with my fellow parents.  We give our children the tools they need: good morals, right from wrong along with many other lessons.  But there is the point they start making their own decisions.  It is not a clear line that is crossed but a gradual transition into making all their own decisions.  We correct them along the way but there is a certain point where the time for correcting is gone. This is the most painfully and stressful time for parents.  We watch them continue to grow up and make mistakes and they all make mistakes.  We just hope and pray none of those mistakes is so big that they change their life forever or worse end it.

I saw how to do this on but the information was out of date. Download and install diffmerge. I used this link:  DiffMerge . Verify you can run it from the command line: Run the following commands from the git command line git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd 'sgdm "$LOCAL" "$REMOTE"' git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd 'sgdm --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"' git config --global mergetool.diffmerge.trustExitCode true Now use the standard git commands for launching diffs and merges git difftool filename.ext git difftool branchname filename.ext git mergetool Note:  I had to perform these steps twice.  Once running the git command line under admin and once under user.