It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

Pooja Bhaumik Jun 20, 2014

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

0 votes
Seth Jun 22, 2014

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
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

3,011 views 1 20
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you