That moment when your co-worker merges his branch and removes all of the work you have done for the last 7 hours, two mi - devRant

Ranter

Comments

2

Codex404

15887

7y

Then start using git and you dont have that issue.
0

funsizedFatale

39

7y

This is using git. Not sure how my stuff was overwritten and erased, but we're going to have to figure it tomorrow.
1

Codex404

15887

7y

@funsizedFatale you have a local version of your code then.
0

funsizedFatale

39

7y

The local version was rewritten too
0

funsizedFatale

39

7y

Again we are unsure how and are going to look more into it tomorrow
0

funsizedFatale

39

7y

What's weird is all the commits I made from my local branch are visible in the history, but in my editor the changes were deleted or over written after he merged his branch
4

blackfaded

46

7y

Work in feature branches in the future.
Revert to YOUR last commit...
3

anolis

352

7y

Here's some reading on the feature branch workflow. https://atlassian.com/git/...

And for the problem first thing in the morning, perhaps this site may help now or in the future.

www.ohshitgit.com
1

funsizedFatale

39

7y

@anolis thank you!
4

arcsector

2281

7y

Sounds like he had local merge conflicts and just deleted all your work; what a careless decision
2

LMagnus

2029

7y

Use pull requests.
3

purpletoxicrain

1372

7y

This could not have happened if you knew how to git
1

electrineer

27713

7y

Sounds like a badly resolved merge conflict, as @arcsector already mentioned.

devRant © 2021 Hexical Labs LLC
Privacy Policy | Terms of Service