Missed Team ’24? Catch up on announcements here.

×
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

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

Pooja Bhaumik
Pooja Bhaumik
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
June 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?

Answer
Watch
Like Be the first to like this
394 views

1 answer

0 votes
Seth
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
June 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"?

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events