I am taken course in udacity (not nanodegree) . It discuss git and github . In discussing pull and push , I asked my self what if a conflict happens . Several developers commits the files of course a conflict will happen .. i didn't find an answer . Can anyone answer my question? I tried to make commits in the same line in github and local repo and a conflict happened!
Asked
Active
Viewed 73 times
-1
-
https://help.github.com/articles/resolving-a-merge-conflict-on-github/ – Idos Sep 05 '18 at 22:59
-
Okay bro i know how to solve conflicts .. but i it will be alot of conflicts because of the number of developers commit the files – Ahmed A. Talawy Sep 05 '18 at 23:04
-
What's the difference if it's many conflicts or just one? Usually it's common practice to rebase your branch frequently to avoid this situation. – Idos Sep 05 '18 at 23:08
-
3Possible duplicate of [How to avoid git conflicts in a team?](https://stackoverflow.com/questions/16490873/how-to-avoid-git-conflicts-in-a-team) – phd Sep 05 '18 at 23:59
-
https://stackoverflow.com/search?q=%5Bgit%5D+how+to+avoid+conflicts – phd Sep 05 '18 at 23:59
1 Answers
0
The short answer is that the mechanism for resolving conflicts is called merging.
"i didn't find an answer" - I'm not sure where you looked, but here a some articles to get you started:
tymtam
- 31,798
- 8
- 86
- 126