Notes

Git push




Last login: Mon Jul 13 16:21:25 on console
MacBook-ss:~ user$ cd documents
MacBook-ss:documents user$ cd flutter_projeler
MacBook-ss:flutter_projeler user$ ls
app-carprotect-development app-carprotect-working-version
app-carprotect-git app-carprotect-yedek
app-carprotect-history hello_world
MacBook-ss:flutter_projeler user$ cd app-carprotect-git
MacBook-ss:app-carprotect-git user$ ls
app-carprotect
MacBook-ss:app-carprotect-git user$ cd app-carprotect
MacBook-ss:app-carprotect user$ git config --global user.name "semih"
MacBook-ss:app-carprotect user$ git config --global user.email "[email protected]"
MacBook-ss:app-carprotect user$ git checkout login_page_design
error: Your local changes to the following files would be overwritten by checkout:
android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
android/.gradle/buildOutputCleanup/outputFiles.bin
lib/core/components/action_button.dart
lib/onboarding/components/input_field.dart
lib/onboarding/login/login_screen.dart
Please commit your changes or stash them before you switch branches.
Aborting
MacBook-ss:app-carprotect user$ git branch
* login-page
MacBook-ss:app-carprotect user$ git add .
MacBook-ss:app-carprotect user$ git commit -m "Login Page Minor Fixes"
[login-page 85091fc] Login Page Minor Fixes
9 files changed, 111 insertions(+), 68 deletions(-)
rewrite android/.gradle/buildOutputCleanup/outputFiles.bin (91%)
MacBook-ss:app-carprotect user$ git pull origin login_page_design
From https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect
* branch login_page_design -> FETCH_HEAD
warning: Cannot merge binary files: android/.gradle/buildOutputCleanup/outputFiles.bin (HEAD vs. eb4b422c4a7e45455f5a1d817b12eafdd06038c5)
warning: Cannot merge binary files: android/.gradle/buildOutputCleanup/buildOutputCleanup.lock (HEAD vs. eb4b422c4a7e45455f5a1d817b12eafdd06038c5)
Auto-merging lib/onboarding/components/input_field.dart
CONFLICT (content): Merge conflict in lib/onboarding/components/input_field.dart
Removing lib/dashboard/dealer/components/carousel/dealer_app_bar.dart
Auto-merging lib/core/components/action_button.dart
Auto-merging lib/core/base_screen.dart
CONFLICT (content): Merge conflict in lib/core/base_screen.dart
Auto-merging android/.gradle/buildOutputCleanup/outputFiles.bin
CONFLICT (content): Merge conflict in android/.gradle/buildOutputCleanup/outputFiles.bin
Auto-merging android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
CONFLICT (content): Merge conflict in android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Automatic merge failed; fix conflicts and then commit the result.
MacBook-ss:app-carprotect user$ git push origin login_page_design
error: src refspec login_page_design does not match any.
error: failed to push some refs to 'https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect.git'
MacBook-ss:app-carprotect user$ git push origin login-page
To https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect.git
! [rejected] login-page -> login-page (fetch first)
error: failed to push some refs to 'https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
MacBook-ss:app-carprotect user$ git pull origin login-page
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
MacBook-ss:app-carprotect user$ git checkout login_page_design
android/.gradle/buildOutputCleanup/buildOutputCleanup.lock: needs merge
android/.gradle/buildOutputCleanup/outputFiles.bin: needs merge
lib/core/base_screen.dart: needs merge
lib/onboarding/components/input_field.dart: needs merge
error: you need to resolve your current index first
MacBook-ss:app-carprotect user$ git branch
* login-page
MacBook-ss:app-carprotect user$ git add .
MacBook-ss:app-carprotect user$ git pull origin login-page
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
MacBook-ss:app-carprotect user$ git commit -m "Minor Fixes of Login Page"
[login-page 427ecea] Minor Fixes of Login Page
MacBook-ss:app-carprotect user$ git pull origin login-page
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect
* branch login-page -> FETCH_HEAD
f81e683..8477a95 login-page -> origin/login-page
Merge made by the 'recursive' strategy.
MacBook-ss:app-carprotect user$ git push origin login-page
Enumerating objects: 97, done.
Counting objects: 100% (72/72), done.
Delta compression using up to 4 threads
Compressing objects: 100% (29/29), done.
Writing objects: 100% (31/31), 22.44 KiB | 3.74 MiB/s, done.
Total 31 (delta 20), reused 0 (delta 0)
remote:
remote: To create a merge request for login-page, visit:
remote: https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect/merge_requests/new?merge_request%5Bsource_branch%5D=login-page
remote:
To https://gitlab.bravocharlie.co.uk/carprotect/app-carprotect.git
8477a95..a264b8f login-page -> login-page
MacBook-ss:app-carprotect user$ git branch
* login-page
MacBook-ss:app-carprotect user$ git branch login_page_design
MacBook-ss:app-carprotect user$ git branch
* login-page
login_page_design
MacBook-ss:app-carprotect user$