Pulling in Master Erases things from my Branch without even Making a Merge Conflict
I posted images of before/after pulling in master. No merge conflicts, the changes just get wiped over. What's going on here?
16 Replies
Git status
Git log --all --oneline
Are you wanting me to post the results of those commands?
Sure
Also I can't recall vs behavior on unsaved files during a git pull
How many people are working on master?
Everyone branches off master and pulls their changes back in. 3 people are doing that atm
I'm betting that revert is what is causing the issues
Ahhh I know what I need to do. I need to pull the changes from CL-add-authentication-redo into CL-add-authentication. Then merge CL-add-authentication into master
How would I pull the changes from CL-add-authentication-redo into CL-add-authentication though?
Since I reverted CL-add-authentication...
I mean master and cl-add-authentication are the same commit
So just make a pr?
You might want to add a --decorate --graph to the git log
I'm having a little trouble reading and making sense of the branches mostly because I'm super tired
Nah that's fair. Here's the rundown
Branched CL-33-Add-Authentication off master
Merged CL-33-Add-Authentication into master
Revert merge CL-33-Add-Authentication into master
Branched CL-33-Add-Authentication-Redo off CL-33-Add-Authentication
Now I merged CL-33-Add-Authentication-Redo into CL-33-Add-Authentication
And I want to merge CL-33-Add-Authentication into main. This way I get the changes from the redo branch and the original CL-33-Add-Authentication branch
So I made a PR to merge CL-33-Add-Authentication into master, but the problem is it only wants to merge in the changes that came in from CL-33-Add-Authentication-Redo. Even though CL-33-Add-Authentication has changes that aren't on master, it's not recongizing any of them. All it's recognizing that it needs to merge into master is the 3 commits that I just merged into CL-33-Add-Authentication from the CL-33-Add-Authentication-Redo branch
Sorry if that's still a brain-melter
Example: CL-33-Add-Authentication has a CustomerLogin.CS
Master does not
And my PR is not showing that it's going to merge in that CustomerLogin.CS file
Lemme move to a bigger screen which means moving off my couch and I'm covered in dogs
Much love Mayor McCheese, thank you for your help
I'm wondering if I should just revert my revert? Wouldn't that get me a branch with all the commits in place?
And then maybe I could put CL-33-Add-Authentication-Redo into that one?
I mean revert should be fine
Why revert revert?
Do you have any orphans locally?
I do not
so you have master & cl-33-addauthentication both pointing at the same commit, and the commit message is that merged the revert
I'm a bit confused there