Skip to content

Latest commit

 

History

History
231 lines (116 loc) · 6 KB

README.md

File metadata and controls

231 lines (116 loc) · 6 KB

Meta

TODO: See the java_version_notes.md file regarding Java files on my computer. On second thought, maybe that info isn't relevant here...

Purpose

The purpose of this Meta/ directory is to house info regarding this Learning Directory repo. Specifically, information about the files and directories that this repo contains.

And not about Git repos in general. To find info regarding files and directories about Git in general, see the Git/ README file.

About

Naming Conventions in this Repo

Currently

Pascalcase

Future

Maybe Snakecase

Learning Directory Git Workflow

Git workflow for this Learning Directory repo.

For information on Git workflow in general, see the git_workflow/ directory in the Git/ directory.

  1. git checkout dev

    git checkout dev && git status

  2. Push changes from the dev branch to the origin/dev branch.

    git push && git status

  3. Make copy of dev branch (dev_backup).

    git branch

    git branch -d dev_backup && git branch -c dev dev_backup && git branch

  4. git checkout master

    git checkout master && git status

  5. Make copy of master branch (master_backup).

    git branch -d master_backup && git branch -c master master_backup && git branch

  6. Pull changes from origin/master to master branch.

    git pull origin master && git status

  7. Make copy of master branch after pull (master_backup_after_pull).

    git branch -d master_backup_after_pull && git branch -c master master_backup_after_pull && git branch

  8. git checkout dev

    git checkout dev && git status

  1. Merge master into dev.

    git merge master && git status

    or rebase master into dev

    git rebase master && git status

  2. Resolve merge conflicts.

  3. Push changes from the dev branch to the origin/dev branch.

    git push && git status

  4. git checkout master

    git checkout master && git status

  5. Merge dev into master.

    git merge dev && git status

  6. Checkout the dev branch

    git checkout dev && git status

  7. Delete all copies of dev and master branches.

Resources

Resources to explore

These will be deleted when I am done with them. If they are of use they'll be moved to the Vetted Resources section below. Or a relevant file/directory in this directory.

Vetted Resources

Note, Items found in this resources section contain content that do not fit in just one of the directories in this repo.

Directories and Files

Information regarding the directories and files in this directory.

The Learning Directory README.md file.

Directories

This is where the Pull Request template lives. See Pull Request Templates.

Command Line Interfaces

Info on the .gitignore file in general.

List of live hosting sites.

Integrated Development Environments.

This directory houses information about software languages.

Meta

The purpose of this Meta/ directory is to house info regarding this Learning Directory repo.

This directory houses information about the env file(s) in this repo.

This directory houses information about the .gitignore file in this repo.

To house info on the meta topic of .gitignore files.

That said, info on .gitignore may be better suited here maybe?: https://github.com/JamieBort/LearningDirectory/tree/master/Git#associated-links

To house info on the meta topic of README files.

To house template files for this repo.

This directory houses information about all the topics found in the Learning Directory repo.

However the ones found here are here because they encompasses information about more than one topic. Rather than reference this info at least twice, once in each directory, it is placed here.

Repository for my exploration of code testing.

Files

This readme file.

The file listing files and directories that are to be excluded from this repo.

The contribution guide for this repo.

The code of conduct for this repo.

The license for this repo.

The text can be found here.

The readme file for this repo.