... | ... | @@ -52,6 +52,24 @@ git push origin master |
|
|
```
|
|
|
again in order to update origin (i.e., the remote version of the repository).
|
|
|
|
|
|
Now this was obviously an easy example, as the only change was an additional file and master did not change in the mean time. It gets more complicated, if e.g. you are modifying a file present in master, which another user has changed in the mean time. But even this will in may cases be handled automatically by Git, if you happen to have changed different lines of the file. If you have actually committed conflicting changes, this will be shown in the files that are concerned; you have to solve the conflict manually, then add, commit and merge again.
|
|
|
|
|
|
**If you are experiencing trouble with more complex merges, please always ask the owner of the respective repository. If you happen to be the owner, contact the platform admins via the issue tracking board.**
|
|
|
|
|
|
# Further reading about Git:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
... | ... | |