search

funderburkjim / boesp-prep

Prepare Boehtlingk, Indische Sprüche,
MIT License
0 stars 1 forks source link

Pull before push #2

Open funderburkjim opened 3 years ago

funderburkjim commented 3 years ago

Thomas, for reference, here are the steps to push your changes of boesp-1_ansi.txt to this boesp-prep repository.

# In GitBASH, cd to boesp-prep folder
pull # This is extra step we did not discuss. See below for reason
# modify step0/boesp-1_ansi.txt via kedit or whatever, and save
git add .
git commit -m "Your commit message here"
git push
# that's all.  Your revision should now be available in Github for me to pull.

Reason for the 'pull'. Since I am working in this repository, it is likely that I have changed some other files, besides the boesp-1_ans.txt file. By doing a 'pull' as your first step, you will get your repository up to date. If (a) I have changed some files and pushed my changes to Github and (b) you don't do the pull, THEN When you 'push', Git might open a text editor and require you to add some text and then close the file. This is very confusing when first encountered. So if you first do the pull, you'll avoid this confusion and complication.

maltenth commented 3 years ago

@funderburkjim thanks, jim, I will try this today.