Skip to content

More real life examples

Jump to bottom
Scrappers Team edited this page May 18, 2022 · 6 revisions
  1. java-src, natives-src featured master sub-branches and sub-branch a sub-branch of natives-src showing a possibility of a conflict if the parent branch natives-src has changed and the sub-branch hasn't been updated.
  • To update the current branch with its parent use :
git pull https://github.com/Organization/REPO-NAME.git 'parent-branch'

Example, recall you are on sub-branch which is a sub-branch of natives-src, if changes has been commited by other fellows on natives-src, you can update your branch to match these changes using :

git pull https://github.com/Google-Developers-Sohag/Github-Training.git 'natives-src'

  1. shared-folder, build-folder and native-byte-buffer features created from different branches emerging from the master.

Clone this wiki locally