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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,985 views 1 5
Read article

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