https://github.com/johnriv/mcit591-git
https://github.com/johnriv/mcit591-git
Last synced: 3 months ago
JSON representation
- Host: GitHub
- URL: https://github.com/johnriv/mcit591-git
- Owner: JohnRiv
- Created: 2019-04-10T03:46:47.000Z (about 6 years ago)
- Default Branch: master
- Last Pushed: 2019-04-14T23:05:24.000Z (about 6 years ago)
- Last Synced: 2025-01-14T16:34:31.338Z (5 months ago)
- Language: Java
- Size: 4.88 KB
- Stars: 0
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# mcit591-git
Week 11 Assignment
Repo owner: John Riviello
Collaborator: Enrique Vargas
"Peace is not absence of conflict, it is the ability to handle conflict by peaceful means.... and for that there is GitHub!"
Steps To Do:
- [x] Ask your collaborator to make a change to the repository
- [x] In order to keep abreast of the changes made by your collaborator, you will need to pull changes from the repository and sync things up by using the pull command: `git pull origin master --rebase`
- [x] You and your collaborator change the same line of code and try to push the change to the repository. One of you will be fine and one will receive a conflict message.
- [x] Work together to resolve the conflict.
- [X] Post screenshots to the forum!