Created
July 26, 2016 12:19
-
-
Save anonymous/38dee81077776eda1452cc7cbf75954e to your computer and use it in GitHub Desktop.
CherryPick-Issue: Changes where no changes should be
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ rcs-dbahn-result } master » currentCommit=37789eb1f6a30b85eec9b76160a47da01d66e4bf | |
{ rcs-dbahn-result } master » git status | |
On branch master | |
Your branch is up-to-date with 'origin/master'. | |
It took 2.48 seconds to enumerate untracked files. 'status -uno' | |
may speed it up, but you have to be careful not to forget to add | |
new files yourself (see 'git help status'). | |
nothing to commit, working directory clean | |
{ rcs-dbahn-result } master » git cherry-pick -Xtheirs --no-commit ${currentCommit} | |
error: could not apply 37789eb... RCSPF-27642: LTA StandardVMType auf Java 8 umstellen. PAIR: RWEI | |
hint: after resolving the conflicts, mark the corrected paths | |
hint: with 'git add <paths>' or 'git rm <paths>' | |
{ rcs-dbahn-result } master » git status | |
On branch master | |
Your branch is up-to-date with 'origin/master'. | |
Changes to be committed: | |
(use "git reset HEAD <file>..." to unstage) | |
modified: ch.sbb.rcsd.server.function.betriebslagekern.test/.classpath | |
modified: ch.sbb.rcsd.server.function.betriebslagekern/.classpath | |
modified: ch.sbb.rcsd.server.function.ltaprozessor.test.excel/.classpath | |
modified: ch.sbb.rcsd.server.function.ltaprozessor.test/.classpath | |
modified: ch.sbb.rcsd.server.function.ltaprozessor/.classpath | |
modified: ch.sbb.rcsd.server.function.unoimport.specific/.classpath | |
modified: ch.sbb.rcsd.server.nf.tests.test/.classpath | |
modified: ch.sbb.rcsd.server.nf.tests/.classpath | |
modified: ch.sbb.rcsd.server.service.betriebslage.debugdatensammler.test/.classpath | |
modified: ch.sbb.rcsd.server.service.betriebslage.debugdatensammler/.classpath | |
modified: ch.sbb.rcsd.server.service.betriebslagekern.test/.classpath | |
modified: ch.sbb.rcsd.server.service.betriebslagekern/.classpath | |
modified: ch.sbb.rcsd.server.service.cacheloader.test/.classpath | |
modified: ch.sbb.rcsd.server.service.launcher.test/.classpath | |
modified: ch.sbb.rcsd.server.service.ltaprozessor.test/.classpath | |
modified: ch.sbb.rcsd.server.service.ltaprozessor/.classpath | |
modified: ch.sbb.rcsd.server.transfer.ltaprozessor/.classpath | |
modified: de.db.idis.common/.classpath | |
modified: de.db.idis.server.function.common.test/.classpath | |
modified: de.db.idis.server.function.common/.classpath | |
modified: de.db.idis.server.function.fahrplan.test/.classpath | |
modified: de.db.idis.server.function.fahrplan/.classpath | |
modified: de.db.idis.server.function.leittechnikprozessor.test.excel/.classpath | |
modified: de.db.idis.server.function.leittechnikprozessor.test/.classpath | |
modified: de.db.idis.server.function.leittechnikprozessor/.classpath | |
modified: de.db.idis.server.function.unoimport.specific/.classpath | |
modified: de.db.idis.server.service.common.test/.classpath | |
modified: de.db.idis.server.service.common/.classpath | |
modified: de.db.idis.server.service.leittechnikprozessor.test/.classpath | |
modified: de.db.idis.server.service.leittechnikprozessor/.classpath | |
modified: de.db.idis.server.test.base.excel.test/.classpath | |
modified: de.db.idis.server.test.base.excel/.classpath | |
modified: de.db.idis.server.transfer.leittechnik.zssd.test/.classpath | |
modified: de.db.idis.server.transfer.leittechnik.zssd/.classpath | |
modified: de.db.idis.server.transfer.leittechnik/.classpath | |
modified: de.db.idis.server.transfer/.classpath | |
Unmerged paths: | |
(use "git reset HEAD <file>..." to unstage) | |
(use "git add/rm <file>..." as appropriate to mark resolution) | |
deleted by us: ch.sbb.lta.archiv/.classpath | |
deleted by us: ch.sbb.lta.augab.test/.classpath | |
deleted by us: ch.sbb.lta.augab/.classpath | |
deleted by us: ch.sbb.lta.client.application/.classpath | |
deleted by us: ch.sbb.lta.client.management/.classpath | |
deleted by us: ch.sbb.lta.client.stammdaten.zellen/.classpath | |
deleted by us: ch.sbb.lta.common/.classpath | |
deleted by us: ch.sbb.lta.cus.test/.classpath | |
deleted by us: ch.sbb.lta.cus.transfer/.classpath | |
deleted by us: ch.sbb.lta.cus/.classpath | |
deleted by us: ch.sbb.lta.datengenerator.r58.test/.classpath | |
deleted by us: ch.sbb.lta.datengenerator.r58/.classpath | |
deleted by us: ch.sbb.lta.deployagent.test/.classpath | |
deleted by us: ch.sbb.lta.deployagent/.classpath | |
deleted by us: ch.sbb.lta.filter.test/.classpath | |
deleted by us: ch.sbb.lta.filter/.classpath | |
deleted by us: ch.sbb.lta.gems.test/.classpath | |
deleted by us: ch.sbb.lta.gems/.classpath | |
deleted by us: ch.sbb.lta.imon.test/.classpath | |
deleted by us: ch.sbb.lta.imon/.classpath | |
deleted by us: ch.sbb.lta.input.test/.classpath | |
deleted by us: ch.sbb.lta.input/.classpath | |
deleted by us: ch.sbb.lta.jmx/.classpath | |
deleted by us: ch.sbb.lta.lastgenerator/.classpath | |
deleted by us: ch.sbb.lta.preprocessor.test/.classpath | |
It took 2.42 seconds to enumerate untracked files. 'status -uno' | |
may speed it up, but you have to be careful not to forget to add | |
new files yourself (see 'git help status'). | |
{ rcs-dbahn-result } master » |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Output of git show --stat 37789eb1f6a30b85eec9b76160a47da01d66e4bf
commit 37789eb1f6a30b85eec9b76160a47da01d66e4bf
Author: u215877 = Manuel Lehmann manuel.lehmann@sbb.ch
Date: Thu Jul 21 12:39:01 2016 +0000
ch.sbb.lta.archiv/.classpath | 2 +-
ch.sbb.lta.augab.test/.classpath | 2 +-
ch.sbb.lta.augab/.classpath | 2 +-
ch.sbb.lta.client.application/.classpath | 2 +-
ch.sbb.lta.client.management/.classpath | 2 +-
ch.sbb.lta.client.stammdaten.zellen/.classpath | 2 +-
ch.sbb.lta.common/.classpath | 2 +-
ch.sbb.lta.cus.test/.classpath | 2 +-
ch.sbb.lta.cus.transfer/.classpath | 2 +-
ch.sbb.lta.cus/.classpath | 2 +-
ch.sbb.lta.datengenerator.r58.test/.classpath | 2 +-
ch.sbb.lta.datengenerator.r58/.classpath | 2 +-
ch.sbb.lta.deployagent.test/.classpath | 2 +-
ch.sbb.lta.deployagent/.classpath | 2 +-
ch.sbb.lta.filter.test/.classpath | 2 +-
ch.sbb.lta.filter/.classpath | 2 +-
ch.sbb.lta.gems.test/.classpath | 2 +-
ch.sbb.lta.gems/.classpath | 2 +-
ch.sbb.lta.imon.test/.classpath | 2 +-
ch.sbb.lta.imon/.classpath | 2 +-
ch.sbb.lta.input.test/.classpath | 2 +-
ch.sbb.lta.input/.classpath | 2 +-
ch.sbb.lta.integrationstest/.classpath | 2 +-
ch.sbb.lta.jmx/.classpath | 2 +-
ch.sbb.lta.lastgenerator/.classpath | 2 +-
ch.sbb.lta.legacyparser.test/.classpath | 2 +-
ch.sbb.lta.legacyparser/.classpath | 2 +-
ch.sbb.lta.management.test/.classpath | 2 +-
ch.sbb.lta.management/.classpath | 2 +-
ch.sbb.lta.monitoring.common.test/.classpath | 2 +-
ch.sbb.lta.monitoring.common/.classpath | 2 +-
ch.sbb.lta.monitoring.test/.classpath | 2 +-
ch.sbb.lta.monitoring/.classpath | 2 +-
ch.sbb.lta.parser.test/.classpath | 2 +-
ch.sbb.lta.parser/.classpath | 2 +-
ch.sbb.lta.preprocessor.test/.classpath | 2 +-
ch.sbb.lta.preprocessor/.classpath | 2 +-
ch.sbb.lta.rcs.test/.classpath | 2 +-
ch.sbb.lta.rcs/.classpath | 2 +-
ch.sbb.lta.server.test/.classpath | 2 +-
ch.sbb.lta.server/.classpath | 2 +-
ch.sbb.lta.service.launcher/.classpath | 2 +-
ch.sbb.lta.stammdaten.test/.classpath | 2 +-
ch.sbb.lta.stammdaten/.classpath | 2 +-
ch.sbb.lta.stammdatencomparator/.classpath | 2 +-
ch.sbb.lta.tibrv.test/.classpath | 2 +-
ch.sbb.lta.tibrv/.classpath | 2 +-
ch.sbb.lta.transfer/.classpath | 2 +-
ch.sbb.lta.tusp.test/.classpath | 2 +-
ch.sbb.lta.tusp/.classpath | 2 +-
ch.sbb.lta.tzdeexpander.test/.classpath | 2 +-
ch.sbb.lta.tzdeexpander/.classpath | 2 +-
ch.sbb.lta.vergleichsapplikation.integrationstest/.classpath | 2 +-
ch.sbb.lta.vergleichsapplikation.test/.classpath | 2 +-
ch.sbb.lta.vergleichsapplikation/.classpath | 2 +-
ch.sbb.lta.zke.v2.test/.classpath | 2 +-
ch.sbb.lta.zke.v2/.classpath | 2 +-
ch.sbb.lta.znterminal.v2.test/.classpath | 2 +-
ch.sbb.lta.znterminal.v2/.classpath | 2 +-
ch.sbb.lta.zuginfokonverter.test/.classpath | 2 +-
ch.sbb.lta.zuginfokonverter/.classpath | 2 +-
61 files changed, 61 insertions(+), 61 deletions(-)