Sory I'm newbie in using git.. I have small working team to manage my code with git. I have 4 members team include with me. And the question that I want to ask..
Suppose I have created file called
file.txt and then I have added one line with my commit to the master branch with the default text
And then 3 members others called
MrC. Supposed it happends today with different file commit time.
MrA have been cloned the source and edited his work like this.
"-----Text--------" Line added by MrA;
MrA commits to the remote repository in the server..
But at the same time
MrB also have modified with the
file.txt like this
"-----Text--------" Line added by MrB;
MrA commit there's no problem since there's no body change before. Bur when
MrB want to commit it has message error and get the conflict. And then
MrB trying to pull has error also with the message you have to move
file.txt or stash it to merge the content.
How can I suppose to do? I'm still newbie in Git. Thanks
This may be way too late, but it sounds like MrB is trying to commit and push at the same time. He should be able to commit to his local repository without any error, then merge the older commit by MrA from the remote server (would happen with a pull), then push the merged code.
[Note: So it was my turn for Friday Fun and sadly I was sick thanks to rubbish sinus infection... so apologies to most of Europe and Asia for the delayed post. However, I finally got out of bed for t...
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