Github vs Github Codespaces

 GitHub and GitHub Codespaces are related but distinct offerings within the GitHub ecosystem.

GitHub refers to the entire platform, which is a web-based hosting service for version control using Git. It provides:

• Repository Hosting: 

  A place to store and manage your code, including version history, branches, and pull requests.
  

  Collaboration Tools: 

  Features for team collaboration, such as issue tracking, project boards, code reviews, and discussions.
  

  Community Features: 

  A large community of developers, open-source projects, and educational resources.

• CI/CD Integration: 

  Tools like GitHub Actions for automating workflows, testing, and deployment.

GitHub Codespaces is a specific feature within GitHub that provides a cloud-based development environment. It offers:

• Online IDE: 

  A fully-featured Visual Studio Code environment accessible directly in your web browser.
  

  Pre-configured Environments: 

  Instant setup with pre-installed tools and dependencies for various programming languages and frameworks.
  

  Cloud Infrastructure: 

  Runs on GitHub's cloud, allowing you to develop from any device without relying on local machine resources.
  

  Collaboration: 

  Facilitates collaboration by allowing sharing of ports and previewing changes with teammates.
  

  Integration with GitHub: 

  Seamlessly integrates with your GitHub repositories for committing, pushing, and managing code changes.

  In essence:

  GitHub 

  is the overarching platform for code hosting, version control, and collaboration.
  

  GitHub Codespaces 

  is a cloud-based development environment hosted on GitHub that streamlines the development workflow by providing a ready-to-use, online IDE.

You use GitHub to manage your repositories and collaborate, and you can leverage GitHub Codespaces as your development environment for those repositories, offering a convenient and powerful way to code directly in the cloud.

Note  from  Google AI Review

Some Tips to Reduce GIT Conflicts

 When  you  are working  on  same  project  with  many  co-workers  , I think those  small  steps  will  be  reduce pain  of  resolving  GIT conflicts .

1.  Re-base  every  day as  you  can   from  remote branch which you are wanted to merge ,your  local  branch .

2. If  any  thing standard git conflict  resolving ways  you  tried didn't  works , you may  use  this way. Create  a  backup  of  your  current  project  and then  create  a local new  branch  from  remote  branch  which  you  wanted  merge to  finally . Then  copy  paste  your  changes  from backup project  to  new  branch .  You  have to  make  sure  all  your  changes are  copying  to  new  branch .  After  that  please  make  do some  testing  to  check  all  changes  are there .  Then  push  your  changes to remote .  Finally  create  a pull  request . I  think  this  way  may not  be  much  professional  , but  this  also  can use as  your final  try.

Version  1.0.0

Git - Commands

 
•  Suppose $COMMIT_id  was the last commit id before you performed git pull. What you need to undo the last pull is         

                    git reset --hard $COMMIT_id 

•  git diff   -   Show unstaged changes between your index and working directory.                                                                                                                                          
•  git pull    -    This update whole  branches of  local  repository   .                                                                                                                                                                                  
•  The git pull  command is actually a combination of two other commands, git fetch  followed by git merge ,
it does a git fetch and then a git merge where it merges branches that have been setup to be merged in your config

                  git fetch just "downloads" the changes from the remote to your local repository. git pull downloads the changes and merges them into your
                  current branch. "In its default  mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD

• If you want to  get a file( src/main/resources/application-dev.properties) from another branch (master)  to your current working branch then,                                                                               

                  git checkout dev
                  git pull origin  dev
                  git checkout  master -- src/main/resources/application-dev.properties                                                   

• To remove last commit
   git pull origin  dev git reset --hard HEAD~1  //Remove last commit ,1  means one last commit, if  it  is  2,then last two commits gitk git push       origin dev --force

•  To change commit message  use command ,

   $ git commit --amend

   Then window that will open , change message .Then click Esc  button and type :wq

   Finally push changes.

• If you are currently working on local branch master, and the new remote branch has not been created yet:
  
  
  

  git checkout -b new_branch_name //Creates a local branch(as a copy of the current)
  git push origin new_branch_name //Push it to the remote server 

ReadMe File Creating Using Markdown (MD) Format

If you  are  creating readMe file ,using  Markdown ,Then there  is several tools  that you  can  use  to online create .

• stackedit
• dillinger 

 Below some links to markdown tutorials

•  Markdown-Cheatsheet