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?
Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...
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!
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