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?
What do you mean by "cui"? Is that a typo (supposed to be GUI), or is that an acronym for "command user interface"?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.