Daniel James
On 25 December 2013 11:42, Joaquin M Lopez Munoz
wrote: So, I did as Daniel instructed and seemingly eveything's OK now in master branch. So, should I do
git checkout develop git merge -s ours
to sync up SHAs between master and develop, or should I leave like that?
You can, but you don't need "-s ours":
git checkout develop git merge master
It should be a fast-forward merge.
This I did, and the merge was indeed a fast-forward one, but Git refuses to do then a commit on grounds that there are no changes: D:\...libs\multi_index>git commit -m "synced up SHAs between master and develop" # On branch develop # Your branch is ahead of 'origin/develop' by 66 commits. # (use "git push" to publish your local commits) # nothing to commit, working directory clean So, looks like I'm not syncing up anything after all? Joaquín M López Muñoz Telefónica Digital