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

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

Pooja Bhaumik 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?

1 answer

0 votes
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.
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"?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events