In this video, push changes to a remote branch on a remote repository.
- [Instructor] Let's examine what happens … when we want to push some local changes … up to a remote branch that has been updated by other people. … So the scenario would look something like this. … We have the remote server … and it has three commits on it … and we have the local repository on our computer, … which also has three commits. … Everything is in sync. … So then I start work for the day … and let's say I spend an hour putting together a commit … and I commit it to my local repository. … During the time that I was doing my work, … my collaborators were also working … and they already pushed up their changes … to the remote server. … Now if I go and try to push my changes … to the remote server, it will fail … and it's not failing because there's a conflict. … It's not as if someone has made two changes to the same line … and Git doesn't know how to sort it out. … It's because there are new commits there … and Git doesn't know what to do with our new commit. … Our new commit presumably is supposed to go after f36de. …
- Finding and viewing commits
- Creating and switching branches
- Comparing branches
- Resetting branches
- Merging branches
- Stashing uncommitted changes
- Setting up a remote repository
- Creating remote branches
- Fetching and pushing changes to a remote
- Enabling remote collaboration
Skill Level Beginner
1. Navigate the Commit Tree
3. Reset Branches
4. Merge Branches
5. Stash Changes
6. Set Up a Remote
7. Collaborate with a Remote
Next steps3m 40s
- Mark as unwatched
- Mark all as unwatched
Are you sure you want to mark all the videos in this course as unwatched?
This will not affect your course history, your reports, or your certificates of completion for this course.Cancel
Take notes with your new membership!
Type in the entry box, then click Enter to save your note.
1:30Press on any video thumbnail to jump immediately to the timecode shown.
Notes are saved with you account but can also be exported as plain text, MS Word, PDF, Google Doc, or Evernote.