vivekjaiswal4077
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/21/2024 in #questions
Can anyone have a look at this... Please help
So I have a forked repo that I forked using the fork only main branch option after that I had to work on another branch for for that i used git fetch upstream and git checkout -b web-release-3 after checking git remote -v I have two branches as remote origin and upstream and I got all the branches from the remote repo with upstream/ as suffix. Then I created a new branch from the upstream/web-release-3 branch using git checkout -b usecase and made the changes in it and then added those files commited pushed but when made PR it is including code that was pushed from prev commits by other contributors. What should I do to push only my commits. Doing rebase and pushing us giving error as hint: Updates were rejected because the tip of your current branch is behind
2 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
Oh thats cool!
16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
the only thing is for the checkout command it was giving me error like
fatal: 'upstream' is not a commit and a branch 'web-release-3' cannot be created from it
so I ran git checkout -b web-release-3 and then it worked16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
it worked
16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
hey Gad thank you so much
16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
the repo is JSON Schema and I forked it with default settings [only fork main branch] that is why facing this issue, SO I have main branch with me and I want
web-release-3 branch in my local repo so I will run the commands from the main and will be like git fetch upstream and git checkout -b web-release-3 upstream and I will get the branch web-release-3 in my local repo. Is that correct ?16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/16/2024 in #questions
Is there any way I can work on another branch?
will it delete all the PRs I made from that fork
16 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/13/2024 in #questions
Issues with yarn.lock file changes
Okay
8 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/13/2024 in #questions
Issues with yarn.lock file changes
Please help
8 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/13/2024 in #questions
Issues with yarn.lock file changes
adding yarn.lock file to the .gitignore file is also not working and now pushing both files as
modified files .gitignore and yarn.lock8 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/13/2024 in #questions
Issues with yarn.lock file changes
At first in the main branch I mistakenly ran the project using npm but It supposed to be run using yarn that generated package-lock.json file which I deleted when I set up the project again with yarn and installed all the dependencies using
yarn which modified the yarn.lock file after that every branch I make from the main and push code changes it includes those yar.lock files8 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/13/2024 in #questions
Issues with yarn.lock file changes
Suppose I have changed 1 file sidebar.tsx that fixes a github issue so i want to push this specific file to the remote repo. For that i follow steps: 1. I create a new branch (lets say sidenav-removal)from the main branch for and change the code that solves the issue 2. git add sidebar.tsx 3. git status to check if only the specific fiel is tracked 4. It shows the only specific file in green which i want to add/track 5. I commit it using git commit -m "some message" 5. I then push it to the same branch i created using git push origin sidenav-removal 6. after that when i go to my github page to raise a PR I click on the
compare and create pr. But here when i click that button hoping to see only the sidebar.tsx file which i pushed, I see yarn.lock file as well which is increasing the size of the PR and aslo creating merge conflicts.8 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/11/2024 in #questions
Getting same issues again and again
2 replies
TTCTheo's Typesafe Cult
•Created by vivekjaiswal4077 on 3/10/2024 in #questions
Does anyone know how to switch package from npm to yarn
Do i need to run any other command for clean up of any npm addons that came along with it...BTW thank you very much!!
4 replies