Merge changes when same file has been modified by different team members?

I am new to egit. Me and my partner are working on a project. We are facing three problems :

1) Suppose I made a change, and he makes a change in a different file and commits. If I dont commit, I can fetch his commit, but if I DO commit, I can no longer see his commit and when I fetch , it shows " up to date " , even though his changes have not really been updated to mine.

2) if we work on the same file, how can we merge the changes together . I'm guessing there will be lsot changes or conflicts , no idea.

3) How to get rid of conflicts without using cui?

1 answer

What do you mean by "cui"? Is that a typo (supposed to be GUI), or is that an acronym for "command user interface"?

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

29,632 views 26 12
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you