-
-
Save Michaela-Davis/1eb13605dc720ab6173447c93629660b to your computer and use it in GitHub Desktop.
Git Flow
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
➜ nicerink-website git:(develop) ✗ git status | |
On branch develop | |
Your branch is behind 'origin/develop' by 2 commits, and can be fast-forwarded. | |
(use "git pull" to update your local branch) | |
Changes not staged for commit: | |
(use "git add <file>..." to update what will be committed) | |
(use "git checkout -- <file>..." to discard changes in working directory) | |
modified: README.md | |
no changes added to commit (use "git add" and/or "git commit -a") | |
➜ nicerink-website git:(develop) ✗ git add . | |
➜ nicerink-website git:(develop) ✗ git checkout -b feature/README | |
M README.md | |
Switched to a new branch 'feature/README' | |
➜ nicerink-website git:(feature/README) ✗ git commit -m "update README" | |
[feature/README b2d8b7f] update README | |
Committer: Solid Intern <[email protected]> | |
Your name and email address were configured automatically based | |
on your username and hostname. Please check that they are accurate. | |
You can suppress this message by setting them explicitly. Run the | |
following command and follow the instructions in your editor to edit | |
your configuration file: | |
git config --global --edit | |
After doing this, you may fix the identity used for this commit with: | |
git commit --amend --reset-author | |
1 file changed, 22 insertions(+), 15 deletions(-) | |
➜ nicerink-website git:(feature/README) git config --global --edit | |
error: There was a problem with the editor 'vi'. | |
➜ nicerink-website git:(feature/README) git config --global --edit | |
➜ nicerink-website git:(feature/README) git commit --amend --reset-author | |
[feature/README ed0d7c5] update README | |
1 file changed, 22 insertions(+), 15 deletions(-) | |
➜ nicerink-website git:(feature/README) git push -u origin feature/README | |
Counting objects: 3, done. | |
Delta compression using up to 4 threads. | |
Compressing objects: 100% (3/3), done. | |
Writing objects: 100% (3/3), 497 bytes | 0 bytes/s, done. | |
Total 3 (delta 2), reused 0 (delta 0) | |
remote: | |
remote: To create a merge request for feature/README, visit: | |
remote: https://git.soliddigital.com/nicerink/nicerink-website/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2FREADME | |
remote: | |
To git.soliddigital.com:nicerink/nicerink-website.git | |
* [new branch] feature/README -> feature/README | |
Branch feature/README set up to track remote branch feature/README from origin. | |
➜ nicerink-website git:(feature/README) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment