Edited a file from GitHub, conflict in pushing?
This is my scenario:
Created and uploaded a project on GitHub. Did some commits (ahead of origin/master by
n commits). While viewing the repository on GitHub through web browser I found a minor error and can’t control myself from fixing it using GitHub’s very own code editor.
- Editing the git commit message in GitHub
- Github App for Mac crashes upon opening
- creating a public repo with submodules
- Why does Git say my master branch is “already up to date” even though it is not?
- Ruby on Rails, Paperclip, Heroku, GitHub and AWS - securing keys
- TeamCity trigger for Github comment on pull request
After coming to my local repository, what do I do now? I neither want to lose the changes from GitHub’s editor nor want to loose changes that I had already commited.
(I have single branch on that repository (master) and I am only the developer)
2 Solutions collect form web for “Edited a file from GitHub, conflict in pushing?”
You can do a simple
git pull, but I’d recommend doing a
git pull --rebase as this will avoid having to have an additional merge commit joining the two development histories, thus keeping your history tidy.
Here’s a bit of explanation on rebase pulls and how you can enable them by default: http://blog.aplikacja.info/2010/11/git-pull-rebase-by-default/
You will need to do a
git pull, which fetches the changes from Github and merges the two heads.
If you look at the first graphic here, it explains a similar situation.