Versions Compared

Old Version 66

changes.mady.by.user Unknown User (aguettouche)

Saved on

compared with

New Version 67

changes.mady.by.user Unknown User (aguettouche)

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Code Block
languagebash
linenumberstrue
git checkout master           # If Switch to master if not already in masterthere.
git checkout -b <branch_name> # Create and switch to the branch.

...

Code Block
languagebash
linenumberstrue
git checkout master              # Switch to Ifmaster if not already in masterthere.
git checkout -b <branch_name>    # Create and switch to the branch.
git push -u origin <branch_name> # Push the newly created branch to the fork
                                 # and set it to track the remote branch.

...

Code Block
languagebash
linenumberstrue
git checkout master # If not already in master.
      # Switch to master if not already there.
git branch -D <branch_name> # Since the branch has commits that weren't merged,
							# GIT will complain if you try to delete the branch with -d
							# Thus, force it with -D

git pull origin master      # Fetch the latest changes from remote 
                            # and merge them to your local repository.

...

Code Block
languagebash
linenumberstrue
git reset --hard origin/master # Reset back to origin.

git pull origin master         # Fetch the latest changes from remote
                               # and merge them to your local repository.

...

  • Make your your changes on a branch (or even on master) and commit the change to your local clone of the fork using git commit
  • Push your changed code to your private fork:  git push origin <branch_name> where <branch_name> may be master.
  • Then visit your fork at http://github.com/<username>/incubator-nuttx
  • To the right of the Branch menu, click New pull request and follow the instructions.

...