Merge conflicts in 0.6.1

[Guiri]

Could someone walk me through how to resolve a given merge conflict? I assume I just edit the files in vim and generally delete the older entry toward the bottom for each conflict?

git pull
remote: Counting objects: 387, done.
remote: Compressing objects: 100% (243/243), done.
remote: Total 387 (delta 232), reused 199 (delta 144)
Receiving objects: 100% (387/387), 159.08 KiB, done.
Resolving deltas: 100% (232/232), done.
From https://github.com/NodeBB/NodeBB
   255f503..c351261  master     -> origin/master
 + 4b34138...4686ae9 v0.6.x     -> origin/v0.6.x  (forced update)
 * [new tag]         v0.6.1     -> v0.6.1
Auto-merging npm-shrinkwrap.json
CONFLICT (add/add): Merge conflict in npm-shrinkwrap.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Removing public/src/helpers.js
Auto-merging public/src/translator.js
Auto-merging src/controllers/api.js
Auto-merging src/database/redis/sorted.js
CONFLICT (content): Merge conflict in src/database/redis/sorted.js
Auto-merging src/socket.io/index.js
Removing src/views/admin/partials/fontawesome.tpl
Automatic merge failed; fix conflicts and then commit the result.

[shady2k]

@Guiri

git checkout -- .
git pull

But you lost your local changes.

[Guiri]

@shady2k I've resolved conflicts in the 3 files. Why does it think I've diverged my branch?

http://fpaste.org/183416/14235045/

[julian]

Normally, there should be no reason to modify any files provided by NodeBB (such as package.json or npm-shrinkwrap.json.

In the case for v0.6.1, I think there may have been an issue with some files that have conflicted. In that case, the newer entry would be correct.

[Guiri]

Thanks. Resolved using git reset -hard followed by your hash.

[Shaun]

Trying to upgrade to 0.6.1 and this is what happens:

> git status
Your branch and 'origin/v0.6.x' have diverged,
and have 105 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

> git pull
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.

> git status
Your branch and 'origin/v0.6.x' have diverged,
and have 105 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be commited:
        new file:    npm-shrinkwrap.json

Unmerged paths:
  (use "git add <file..." to mark resolution)

        both modified:        package.json

Have tried git reset --hard and git fetch, can't seem to resolve this. What should I do about this?

[Shaun]

@Shaun said:

Have tried git reset --hard

So the resolution for me was:

git reset --hard 4686ae992318eeaaff1945868ee4cc094dcda17d
git pull

Wasn't sure where to find the hash, but git put it in the package.json file. I did not alter this file or any other after installing 0.6.0, so I'm very confused about how this conflict arose. The conflicting line was the version number, which in my local file was, apparently, 0.7.0-dev (I believe). Again, no clue how that got in there.