search

UPB-FILS-SdE2 / questions

0 stars 1 forks source link

[rustybox] can't commit or push in codespace :( #87

Closed dincaioana closed 8 months ago

dincaioana commented 1 year ago

What now?

rustybox1
alexandruradovici commented 1 year ago

Pleae click on Open Git Log and Show command Ouput and place the messages from the log here.

You can try running the commands:

git pull # this will update your repository to the newest version
git push
dincaioana commented 1 year ago

Show Command Output:

git pull --tags origin main From https://github.com/UPB-FILS-SdE2/devoir-1---rustybox-dincaioana

  • branch main -> FETCH_HEAD fatal: Not possible to fast-forward, aborting.

git pull and push didn't work

alexandruradovici commented 1 year ago

Can you post a screenshot of the output?

Please run git remote -v.

dincaioana commented 1 year ago
Screenshot_2

From Open Git Log:

2023-03-23 19:48:58.710 [info] Log level: Info 2023-03-23 19:48:58.710 [info] Validating found git in: "git" 2023-03-23 19:48:58.710 [info] Using git "2.34.1" from "git" 2023-03-23 19:48:58.710 [info] > git rev-parse --show-toplevel [63ms] 2023-03-23 19:48:58.710 [info] > git rev-parse --git-dir --git-common-dir [71ms] 2023-03-23 19:48:58.710 [info] Open repository: /workspaces/devoir-1---rustybox-dincaioana 2023-03-23 19:48:58.710 [info] > git config --get commit.template [147ms] 2023-03-23 19:48:58.710 [info] > git rev-parse --show-toplevel [160ms] 2023-03-23 19:48:58.710 [info] > git rev-parse --show-toplevel [24ms] 2023-03-23 19:48:58.710 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [22ms] 2023-03-23 19:48:58.710 [info] > git status -z -uall [125ms] 2023-03-23 19:48:58.710 [info] > git rev-parse --show-toplevel [144ms] 2023-03-23 19:48:58.710 [info] > git rev-parse --show-toplevel [32ms] 2023-03-23 19:48:58.743 [info] > git config --get commit.template [48ms] 2023-03-23 19:48:58.765 [info] > git rev-parse --show-toplevel [56ms] 2023-03-23 19:48:58.816 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [15ms] 2023-03-23 19:48:58.828 [info] > git rev-parse --show-toplevel [49ms] 2023-03-23 19:48:58.860 [info] > git status -z -uall [33ms] 2023-03-23 19:48:58.861 [info] > git rev-parse --show-toplevel [17ms] 2023-03-23 19:48:58.900 [info] > git rev-parse --git-dir --git-common-dir [26ms] 2023-03-23 19:48:58.905 [info] Open repository: /workspaces/devoir-1---rustybox-dincaioana/tests 2023-03-23 19:48:58.938 [info] > git config --get commit.template [16ms] 2023-03-23 19:48:58.941 [info] > git for-each-ref --format %(refname) %(objectname) %(*objectname) refs/tags [4ms] 2023-03-23 19:48:59.022 [info] > git status -z -uall [70ms] 2023-03-23 19:48:59.022 [info] > git show --textconv :src/main.rs [51ms] 2023-03-23 19:48:59.036 [info] > git ls-files --stage -- /workspaces/devoir-1---rustybox-dincaioana/src/main.rs [53ms] 2023-03-23 19:48:59.286 [info] > git cat-file -s d6be6f20c13543b3fec5f77948b32eefa7f16d85 [237ms] 2023-03-23 19:48:59.755 [info] > git check-ignore -v -z --stdin [14ms] 2023-03-23 19:48:59.759 [info] > git check-ignore -v -z --stdin [6ms] 2023-03-23 19:49:00.105 [info] > git config --local branch.main.github-pr-owner-number [122ms] 2023-03-23 19:49:00.180 [info] > git config --get commit.template [35ms] 2023-03-23 19:49:00.214 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [18ms] 2023-03-23 19:49:00.236 [info] > git status -z -uall [10ms] 2023-03-23 19:49:01.717 [info] > git fetch origin main [828ms] 2023-03-23 19:49:01.717 [info] From https://github.com/UPB-FILS-SdE2/devoir-1---rustybox-dincaioana

alexandruradovici commented 1 year ago

Run git pull in the terminal, what does it say?

If you run git push, what error do you get?

dincaioana commented 1 year ago
Screenshot_3
alexandruradovici commented 1 year ago

The solution is to run git pull origin main --rebase.