Can anyone have a look at this... Please help
I fetched a new branch from the remote repo that was created recently using
git fetch upstream and git checkout -b newbranchname and a new branch was created so i have branch named upstream/new branch name but after making changes in it, commiting and pushing it to the remote repo it is pushing the code from the previous commits made by other contributors and that is creating merge conflicts, I want to just push my changes to the remote repo.
In the picture i just modified components/card file and did git add components/card but then also the other changes that were pushed previouslyby other contributors are also getting push along with my push
If anyone has any suggestion please help.
1 Reply
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