Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,455,321
Community Members
 
Community Events
175
Community Groups

Why is Merge Deleting Files?

Edited

I'm working on a group project with some students.

We're using gitlab but I believe we are all using sourcetree as the GUI.

Now we have dev as our main branch that we branch out from and then merge back into.

One of the contributors, tried to merge into dev, and I think because she didn't fetch first, it caused some files to be deleted, since she was merging into an older commit(was odd it even let her push considering that). So then she used the reverse commit feature(where new commit but reverses the old one). And then correctly merged afterwards.

But for some reason, now when I try to merge with dev from my branch, it deletes a lot of files.

The weirder thing is, when I merged, the files weren't even in the staging list. They only appeared after I actually commited.

Only thing I could think of, was that the system wasn't designed to take into consideration reverse commits?

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events