Switched branch without commiting changes, what do I do now?
I'm making my edits on a branch while my partner is working on the main. I switched branch to check on their latest push but I didn't commit my change before changing to the main branch. I didn't know it was gonna mess things up for me when I returned to mine. Now I'm stuck with this:
GitHub page:
When I hit restore:
error: Could not write index
FullHarvest_Daph (MajorPush-1)/Packages/manifest.json: needs merge
FullHarvest_Daph (MajorPush-1)/Packages/packages-lock.json: needs merge
The stash entry is kept in case you need it again.
I can see that my changes are still there, but how do I restore it?
I've only tried hitting restore and ran into the above error. I directly edited everything from my latest commit. Was told my burst package was removed when I went back to my in-progress-file so I ended up CLOSING it--not sure if I should have. Now I can no longer open the file.
I also selected "leave changes in my branch" before changing to main, and when switching back to my branch I selected "bring change over". But the changes I see stashed so far are accurate to the changes I make.
I don't know how to proceed. I'm afraid of damaging things further. Do I try committing whatever there is to commit - then restore to stash?
I am new to game development, coding, and GitHub, so please have patience with me.
The easiest and safest way to deal with any course control issue like this is to copy your local files to a new directory, then wipe the version controlled working copy (ie your local stuff), check out fresh and then then copy your changes over the top as if you'd just edited them.
Over the years I have found this works to solve any and every issue with your SCM.
- Support for password authentication was removed on August 13, 2021
- PowerShell script to call git init in all subdirectories
- git clone hangs forever on github
- git status shows fatal: bad object HEAD
- git diff renamed file
- Is a .gitattributes file really necessary for git?
- How to add custom git command to zsh completion?
- Log in to GitHub from the command line with multiple accounts
- Git error - gpg failed to sign data
- How do I prevent 'git diff' from using a pager?
- what to do when you don't want a specific file to be tracked by git
- How to create a git repository in memory?
- Should "git submodule update" or "git submodule init" be executed first?
- With git, how do I remove a local copy of a remote branch? Or at least pull without merging?
- How to push new branch without history
- How can I rename a git worktree
- How do I add a private Git repository as a submodule inside a public Git repository?
- Why does the COMMIT_EDITMSG open when I try to commit in vscode?
- Git Clone - Repository not found
- How to import a zscaler certificate into Git
- Configuring Elastic Beanstalk for SSH access to private git repo using Amazon Linux 2 hooks
- Switched branch without commiting changes, what do I do now?
- git diff showing only commits that revision/branch A is ahead of revision/branch B
- How to install git on a docker ubuntu image?
- What happens to a git submodule when its referenced repo is deleted?
- How do I create a "True merge" from the current HEAD into a previous commit reachable from HEAD?
- Can I run Git commands in Visual Studio?
- git commit and push even although no changes have been made, it's necessary to trigger web hook
- unable to run a function from imported groovy library getting "No such property: git for class: groovy.lang.Binding"
- How can I rename a local Git branch?