pull error

[sarah-alam-malik]

Hi,
I'm getting the following conflicts when trying to pull the alphaT repository,
[smalik@lxplus0061 src]$ git pull alphaT-repo CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6
Enter passphrase for key '/afs/cern.ch/user/s/smalik/.ssh/id_rsa':
remote: Counting objects: 498, done.
remote: Compressing objects: 100% (174/174), done.
remote: Total 498 (delta 381), reused 416 (delta 322)
Receiving objects: 100% (498/498), 87.33 KiB | 0 bytes/s, done.
Resolving deltas: 100% (381/381), done.
From github.com:CMSRA1/cmg-cmssw

• branch CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6 -> FETCH_HEAD
  Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py
  CONFLICT (add/add): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py
  Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py
  CONFLICT (content): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py
  Automatic merge failed; fix conflicts and then commit the result.

[aelwood]

Hi Sara,

This is due to a discrepancy between the pull request that we made to the cmg central repo and the �CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6 branch in our alphaT repo. There is a pull request pending to fix it. For now you should be able to pull from MiniAOD_baseCutFlow instead.

i.e. undo the merge:

git reset —merge

Then pull the other branch:

git pull alphaT-repo MiniAOD_baseCutFlow

�The merge conflicts should be fixed soon.

Let me know if this doesn’t work/ you have any more problems.

Cheers,
Adam

On 1 Dec 2014, at 17:05, sarah-alam-malik <[email protected]mailto:[email protected]> wrote:

Hi,
I'm getting the following conflicts when trying to pull the alphaT repository,
[smalik@lxplus0061 src]$ git pull alphaT-repo CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6
Enter passphrase for key '/afs/cern.ch/user/s/smalik/.ssh/id_rsa':http://cern.ch/user/s/smalik/.ssh/id_rsa':
remote: Counting objects: 498, done.
remote: Compressing objects: 100% (174/174), done.
remote: Total 498 (delta 381), reused 416 (delta 322)
Receiving objects: 100% (498/498), 87.33 KiB | 0 bytes/s, done.
Resolving deltas: 100% (381/381), done.
From github.com:CMSRA1/cmg-cmssw

• branch CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6 -> FETCH_HEAD Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py CONFLICT (add/add): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py CONFLICT (content): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py Automatic merge failed; fix conflicts and then commit the result.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/14.